diff options
| author | akhropov <akhropov@yandex-team.com> | 2024-01-30 18:37:28 +0300 |
|---|---|---|
| committer | akhropov <akhropov@yandex-team.com> | 2024-01-30 19:05:32 +0300 |
| commit | 7e4754cb6ffe5a488141eb8773d1810b0798ec64 (patch) | |
| tree | 3df61218d05f0c8f3d3f8353288c865497ec23b7 /cmake | |
| parent | 9952368b003423cea881ec00e66439f25f26c38b (diff) | |
| download | ydb-7e4754cb6ffe5a488141eb8773d1810b0798ec64.tar.gz | |
Set conan os.version setting from CMAKE_OSX_DEPLOYMENT_TARGET..
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/conan.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/conan.cmake b/cmake/conan.cmake index 933d7fc98b..a8e812acbd 100644 --- a/cmake/conan.cmake +++ b/cmake/conan.cmake @@ -92,6 +92,8 @@ macro(_conan_check_system_name) set(CONAN_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") set(CONAN_SYSTEM_NAME Macos) + message(STATUS "CMake-Conan: cmake_osx_deployment_target=${CMAKE_OSX_DEPLOYMENT_TARGET}") + set(_CONAN_SETTING_OS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "QNX") set(CONAN_SYSTEM_NAME Neutrino) @@ -279,7 +281,7 @@ function(conan_cmake_settings result) endforeach() if(NOT _SETTINGS OR ARGUMENTS_PROFILE_AUTO STREQUAL "ALL") - set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version + set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version compiler.runtime compiler.libcxx compiler.toolset) endif() @@ -455,7 +457,7 @@ function(conan_cmake_detect_vs_runtime result) endfunction() function(_collect_settings result) - set(ARGUMENTS_PROFILE_AUTO arch build_type compiler compiler.version + set(ARGUMENTS_PROFILE_AUTO arch os.version build_type compiler compiler.version compiler.runtime compiler.libcxx compiler.toolset compiler.cppstd) foreach(ARG ${ARGUMENTS_PROFILE_AUTO}) |