Merge branch 'main' into fix-msvc-library-selection

open-telemetry · Jun 6, 2024 · 2566fa7 · 2566fa7
2 parents 3ff8b97 + 1d8a7b5
commit 2566fa7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -348,12 +348,6 @@ if(MSVC)
     # __cplusplus flag is not supported by Visual Studio 2015
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
   endif()
-  # When using vcpkg, all targets build with the same runtime
-  if(VCPKG_TOOLCHAIN)
-    set(CMAKE_MSVC_RUNTIME_LIBRARY
-        "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>"
-        CACHE STRING "")
-  endif()
 endif()
 
 # include GNUInstallDirs before include cmake/opentelemetry-proto.cmake because