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

Jump to bottom

CMakeToolchain: Honor vc runtime from profile even if cmake_minimum_required() < 3.15 in CMakeLists #10390

Merged
merged 3 commits into from Jan 25, 2022
Merged

CMakeToolchain: Honor vc runtime from profile even if cmake_minimum_required() < 3.15 in CMakeLists #10390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de71ffc
force CMP0091 policy to NEW in CMakeToolchain if msvc
SpaceIm Jan 20, 2022
57632b6
CMakeToolchain requires at least CMake >= 3.15
SpaceIm Jan 20, 2022
c77f110
external injection of policy must use CMAKE_POLICY_DEFAULT_CMPNNNN
SpaceIm Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions conan/tools/cmake/toolchain.py
View file
Open in desktop
Expand Up @@ -99,6 +99,7 @@ class VSRuntimeBlock(Block):
{% set genexpr.str = genexpr.str +
'$<$<CONFIG:' + config + '>:' + value|string + '>' %}
{% endfor %}
set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "{{ genexpr.str }}")
""")

Expand Down Expand Up @@ -798,6 +799,10 @@ class CMakeToolchain(object):
message("Using Conan toolchain: ${CMAKE_TOOLCHAIN_FILE}.")
endif()

if(${CMAKE_VERSION} VERSION_LESS "3.15")
message(FATAL_ERROR "The 'CMakeToolchain' generator only works with CMake >= 3.15")
endif()

{% for conan_block in conan_blocks %}
{{ conan_block }}
{% endfor %}
Expand Down