fix

Author: lalitb

CMakeLists.txt

@@ -31,6 +31,10 @@ if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
   include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
 endif()
 
+if (DEFINED CMAKE_TOOLCHAIN_FILE AND WIN32)
+  install_windows_deps()
+endif()
+
 # Begin Uncomment for i386 build
 #set(CMAKE_SYSTEM_PROCESSOR i386)
 #set(CMAKE_C_FLAGS -m32)

lib/CMakeLists.txt

@@ -173,7 +173,14 @@ if(PAL_IMPLEMENTATION STREQUAL "CPP11")
 elseif(PAL_IMPLEMENTATION STREQUAL "WIN32")
 # Win32 Desktop for now.
 # TODO: define a separate PAL for Win10 cmake build
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../zlib ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite)
+if (CMAKE_TOOLCHAIN_FILE)
+  find_package(SQLite3 REQUIRED)
+  find_package(ZLIB REQUIRED)
+  include_directories( ${ZLIB_INCLUDE_DIRS})
+  include_directories(${SQLite3_INCLUDE_DIRS})
+else()
+  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../zlib ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite)
+endif()
 add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DMATSDK_PLATFORM_WINDOWS=1 -DMATSDK_SHARED_LIB=1 -D_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7)
 remove_definitions(-D_MBCS)
   list(APPEND SRCS

tests/CMakeLists.txt

@@ -11,7 +11,7 @@ set(TESTS_COMMON_SRCS
 )
 
 if (BUILD_FUNC_TESTS OR BUILD_UNIT_TEST)
-  if (WIN32)
+  if (WIN32 AND CNAKE_TOOLCHAIN_FILE)
     find_package(GTest)
     if(NOT (GTEST_FOUND OR GTest_FOUND))
       install_windows_deps()

tests/functests/CMakeLists.txt

@@ -48,7 +48,12 @@ endif()
 if(PAL_IMPLEMENTATION STREQUAL "WIN32")
   find_package(gtest REQUIRED)
   find_package(SQLite3 REQUIRED)
-  find_package( ZLIB REQUIRED )
+  find_package(ZLIB REQUIRED)
+  find_library(GOOGLE_MOCK gmock REQUIRED) 
+  find_library(GOOGLE_MOCK_MAIN gmock_main REQUIRED)
+  find_library(GOOGLE_MOCKD gmockd REQUIRED) 
+  find_library(GOOGLE_MOCK_MAIND gmock_maind REQUIRED)
+  add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY)
   # Link against prebuilt libraries on Windows
   message("--- WIN32: Linking against prebuilt libraries")
   message("--- WIN32: ... ${CMAKE_BINARY_DIR}/sqlite")
@@ -58,15 +63,20 @@ if(PAL_IMPLEMENTATION STREQUAL "WIN32")
   include_directories(${SQLite3_INCLUDE_DIRS} )
   message("GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
   message("GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
+  message("GOOGLE_MOCK = ${GOOGLE_MOCK} ${GOOGLE_MOCK_MAIN}")
   message("SQLite3_LIBRARIES = ${SQLite3_LIBRARIES} ${SQLite3_INCLUDE_DIRS}")
   message("ZLIB_LIBRARIES = ${ZLIB_LIBRARIES}")
 
   target_link_libraries(FuncTests
   	mat
 	wininet.lib
+  crypt32.lib
   ${GTEST_BOTH_LIBRARIES}
+  ${GOOGLE_MOCK} ${GOOGLE_MOCKD}
+  ${GOOGLE_MOCK_MAIN} ${GOOGLE_MOCK_MAIND}
   ${SQLite3_LIBRARIES}
   ${ZLIB_LIBRARIES}
+
   )
 else()