debug

mathworks · Jul 3, 2024 · 7204e68 · 7204e68
1 parent 5239609
commit 7204e68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -106,6 +106,11 @@ string(STRIP ${OTEL_MATLAB_VERSION_RAW} OTEL_MATLAB_VERSION)
 
 project(${CLIENT_PROJECT_NAME} VERSION ${OTEL_MATLAB_VERSION} LANGUAGES CXX)
 
+if(WIN32)
+    # workaround a GitHub runner issue
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+endif()
+
 # ######################################
 # libmexclass 
 # ######################################
@@ -218,11 +223,6 @@ endif()
 
 set(OPENTELEMETRY_PROXY_LIBRARY_NAME "OtelMatlabProxy")
 
-if(WIN32)
-    # workaround a GitHub runner issue
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /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,6 @@ if(${PORT} MATCHES "abseil")
 else()
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()
-set(VCPKG_CXX_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR /MT")
+set(VCPKG_CXX_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
 set(VCPKG_C_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_CRT_LINKAGE static)