initial commit for building through CMake in Windows

Author: lalitb

CMakeLists.txt

@@ -5,6 +5,32 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
 
+function(install_windows_deps)
+  # Bootstrap vcpkg from CMake and auto-install deps in case if we are missing
+  # deps on Windows. Respect the target architecture variable.
+  set(VCPKG_TARGET_ARCHITECTURE
+      ${ARCH}
+      PARENT_SCOPE)
+  message("Installing build tools and dependencies...")
+  set(ENV{ARCH} ${ARCH})
+  execute_process(
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/setup-buildtools.cmd)
+  set(CMAKE_TOOLCHAIN_FILE
+      ${CMAKE_SOURCE_DIR}/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+      PARENT_SCOPE)
+endfunction()
+
+# Autodetect vcpkg toolchain
+if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+  set(CMAKE_TOOLCHAIN_FILE
+      "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+      CACHE STRING "")
+endif()
+
+if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+  include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
+endif()
+
 # Begin Uncomment for i386 build
 #set(CMAKE_SYSTEM_PROCESSOR i386)
 #set(CMAKE_C_FLAGS -m32)
@@ -295,7 +321,7 @@ endif()
 # Packaging
 ################################################################################################
 
-if (BUILD_PACKAGE)
+if (BUILD_PACKAGE AND (NOT WIN32))
   if (${CMAKE_PACKAGE_TYPE} STREQUAL "deb")
     # FIXME: hardcode it for 64-bit Linux for now
     set(INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CPACK_DEBIAN_ARCHITECTURE}-linux-gnu)

tests/CMakeLists.txt

@@ -22,3 +22,16 @@ if(BUILD_UNIT_TESTS)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/unittests)
   add_subdirectory(unittests)
 endif()
+
+if (WIN32 AND (BUILD_FUNC_TESTS OR BUILD_UNIT_TEST))
+message("LALIT-->Checkig..")
+find_package(GTest)
+if(NOT (GTEST_FOUND OR GTest_FOUND))
+  install_windows_deps()
+  if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+    message(STATUS_FATAL "Windows dependency installation failed!")
+  endif()
+  message(STATUS ${CMAKE_TOOLCHAIN_FILE})
+  find_package(GTest REQUIRED)
+endif()
+endif()

tests/functests/CMakeLists.txt

@@ -30,7 +30,7 @@ endif()
 
 if (EXISTS ${CMAKE_SOURCE_DIR}/lib/modules/exp/tests)
     list(APPEND SRCS
-        ${CMAKE_SOURCE_DIR}/lib/modules/exp/tests/functests/ECSClientFuncTests.cpp
+        ${CMAKE_SOURCE_DIR}/lib/modules/exp/tests/functests/ECSClientFuncTestzlibs.cpp
         ${CMAKE_SOURCE_DIR}/lib/modules/exp/tests/functests/ECSClientRealworldFuncTests.cpp
         ${CMAKE_SOURCE_DIR}/lib/modules/exp/tests/functests/ECSConfigCacheFuncTests.cpp
         )
@@ -46,21 +46,25 @@ else()
 endif()
 
 if(PAL_IMPLEMENTATION STREQUAL "WIN32")
+  find_package(gtest REQUIRED)
+  find_package(sqlite3 REQUIRED)
+  find_package( ZLIB REQUIRED )
   # Link against prebuilt libraries on Windows
   message("--- WIN32: Linking against prebuilt libraries")
-  message("--- WIN32: ... ${CMAKE_BINARY_DIR}/gtest")
-  message("--- WIN32: ... ${CMAKE_BINARY_DIR}/gmock") 
-  message("--- WIN32: ... ${CMAKE_BINARY_DIR}/zlib")
   message("--- WIN32: ... ${CMAKE_BINARY_DIR}/sqlite")
-  # link_directories(${CMAKE_BINARY_DIR}/gtest/ ${CMAKE_BINARY_DIR}/gmock/ ${CMAKE_BINARY_DIR}/zlib/ ${CMAKE_BINARY_DIR}/sqlite/) 
-  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../zlib )
+  include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
+  include_directories( ${ZLIB_INCLUDE_DIRS} )
+  message("GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
+  message("GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
+  message("SQLITE3_LIBRARIES = ${SQLITE3_LIBRARIES}")
+  message("ZLIB_LIBRARIES = ${ZLIB_LIBRARIES}")
+
   target_link_libraries(FuncTests
   	mat
 	wininet.lib
-	${CMAKE_BINARY_DIR}/gtest/gtest.lib
-	${CMAKE_BINARY_DIR}/gmock/gmock.lib
-	${CMAKE_BINARY_DIR}/zlib/zlib.lib
-	${CMAKE_BINARY_DIR}/sqlite/sqlite.lib
+  ${GTEST_BOTH_LIBRARIES}
+  ${SQLite3_LIBRARIES}
+  ${ZLIB_LIBRARIES}
   )
 else()
 

tools/setup-buildtools.cmd

@@ -17,7 +17,11 @@ if ERRORLEVEL 0 (
 )
 
 REM Install tools needed to build SDK with either Visual Studio or CMake
-choco install -y cmake svn git llvm zip
+where /Q vswhere || choco install -y vswhere
+where /Q cmake || choco install -y cmake
+where /Q git || choco install -y git
+where /Q llvm || choco install -y llvm
+where /Q zip || choco install -y zip
 
 REM Try to autodetect Visual Studio
 call "%~dp0\vcvars.cmd"
@@ -55,6 +59,8 @@ REM Install it
 vcpkg install gtest:x64-windows
 vcpkg install --overlay-ports=%~dp0\ports benchmark:x64-windows
 vcpkg install ms-gsl:x64-windows
+vcpkg install zlib:x64-windows
+vcpkg install sqlite3:x64-windows
 
 if DEFINED INSTALL_LLVM (
   REM Required for LLVM Clang build on Windows