Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
duncanpo committed Jul 4, 2024
1 parent be5e0e2 commit fb3e492
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions otel-cpp-windows.patch
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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

0 comments on commit fb3e492

Please sign in to comment.