Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUILD] CMakeLists.txt: Enable CMAKE_MSVC_RUNTIME_LIBRARY support #2652

Merged
merged 4 commits into from
Jun 6, 2024
Merged

[BUILD] CMakeLists.txt: Enable CMAKE_MSVC_RUNTIME_LIBRARY support #2652

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b70f658
CMakeLists.txt: Enable CMAKE_MSVC_RUNTIME_LIBRARY support
t-b Apr 29, 2024
dcb26a6
Merge branch 'main' into fix-msvc-library-selection
ThomsonTan Jun 5, 2024
3ff8b97
Merge branch 'main' into fix-msvc-library-selection
ThomsonTan Jun 6, 2024
2566fa7
Merge branch 'main' into fix-msvc-library-selection
ThomsonTan Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
cmake_policy(SET CMP0074 NEW)
endif()

# Prefer CMAKE_MSVC_RUNTIME_LIBRARY if possible
if(POLICY CMP0091)
cmake_policy(SET CMP0091 NEW)
endif()

project(opentelemetry-cpp)

# Mark variables as used so cmake doesn't complain about them
Expand Down