debug

mathworks · Jul 4, 2024 · 2cca345 · 2cca345
1 parent fb3e492
commit 2cca345
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,9 @@ cmake_policy(SET CMP0074 NEW)
 # vcpkg
 # ###########################
 
-if(WIN32)
-  add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
-endif()
+#if(WIN32)
+#  add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+#endif()
 
 include(FetchContent)
 
@@ -106,11 +106,6 @@ 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 
 # ######################################

diff --git a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake b/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake
@@ -6,6 +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_C_FLAGS_RELEASE "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
-#set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_C_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")