playing around with vcpkg, got it working but all tests fail (most li…

…kely due to legacy gmock)
open-telemetry · Jan 3, 2023 · 070a675 · 070a675
1 parent d9e8473
commit 070a675
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -213,9 +213,14 @@ function(install_windows_deps)
   set(ENV{ARCH} ${ARCH})
   execute_process(
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/setup-buildtools.cmd)
-  set(CMAKE_TOOLCHAIN_FILE
+  # set(CMAKE_TOOLCHAIN_FILE
+  #     ${CMAKE_CURRENT_SOURCE_DIR}/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+  #     PARENT_SCOPE)
+  include(
       ${CMAKE_CURRENT_SOURCE_DIR}/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
-      PARENT_SCOPE)
+      PARENT_SCOPE
+  )
+
 endfunction()
 
 if(WITH_JAEGER)

diff --git a/test_common/src/http/client/nosend/CMakeLists.txt b/test_common/src/http/client/nosend/CMakeLists.txt
@@ -25,7 +25,7 @@ if(${BUILD_TESTING})
   endif()
 
   target_link_libraries(
-    opentelemetry_http_client_nosend ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB}
+    opentelemetry_http_client_nosend ${GTEST_BOTH_LIBRARIES} 
     opentelemetry_ext opentelemetry_test_common)
 
 endif()
diff --git a/tools/setup-buildtools.cmd b/tools/setup-buildtools.cmd
@@ -58,6 +58,7 @@ if %ERRORLEVEL% == 1 (
   popd
 ) else (
   echo Using existing vcpkg installation...
+  set "VCPKG_ROOT=%~dp0\vcpkg"
 )
 
 REM Install dependencies