debug

mathworks · Jul 3, 2024 · 0defc1d · 0defc1d
1 parent 6830dcd
commit 0defc1d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -218,6 +218,11 @@ endif()
 
 set(OPENTELEMETRY_PROXY_LIBRARY_NAME "OtelMatlabProxy")
 
+if(WIN32)
+    # workaround a GitHub runner issue
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
+endif()
+
 find_package(Matlab REQUIRED)
 find_package(Protobuf REQUIRED)
 find_package(nlohmann_json REQUIRED)

diff --git a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake b/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake
@@ -6,5 +6,5 @@ if(${PORT} MATCHES "abseil")
 else()
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
-set(VCPKG_CXX_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CXX_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR /MT")
 set(VCPKG_C_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
diff --git a/otel-cpp-windows.patch b/otel-cpp-windows.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc085b1a..c10b1374 100644
+index cc085b1a..5e3a6b16 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -15,6 +15,10 @@ endif()
@@ -21,3 +21,12 @@ index cc085b1a..c10b1374 100644
  find_package(Threads)
 
  function(install_windows_deps)
+@@ -341,6 +346,8 @@ if(MSVC)
+         "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>"
+         CACHE STRING "")
+   endif()
++  // workaround the GitHub runner image issue
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
+ endif()
+
+ # include GNUInstallDirs before include cmake/opentelemetry-proto.cmake because