From fb3e4921ce076045be0fad4bc666c7387867b2ea Mon Sep 17 00:00:00 2001 From: duncanpo Date: Thu, 4 Jul 2024 16:44:09 -0400 Subject: [PATCH] debug --- cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake | 2 +- otel-cpp-windows.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake b/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake index 448c3ae..2049040 100644 --- a/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake +++ b/cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake @@ -8,4 +8,4 @@ else() 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_CRT_LINKAGE static) diff --git a/otel-cpp-windows.patch b/otel-cpp-windows.patch index d8a98c9..f52471a 100644 --- a/otel-cpp-windows.patch +++ b/otel-cpp-windows.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cc085b1a..d97abd94 100644 +index cc085b1a..618ba876 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,10 @@ endif() @@ -26,7 +26,7 @@ index cc085b1a..d97abd94 100644 CACHE STRING "") endif() + # workaround the GitHub runner image issue -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") ++ #set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") endif() # include GNUInstallDirs before include cmake/opentelemetry-proto.cmake because