From 372391afaa26c463081daf06c95de04764204b35 Mon Sep 17 00:00:00 2001 From: Francisco Ramirez de Anton Date: Mon, 30 Aug 2021 12:02:36 +0200 Subject: [PATCH] Setting CMAKE_OSX_DEPLOYMENT_TARGET as cache entry --- conan/tools/cmake/toolchain.py | 3 ++- conans/test/unittests/tools/cmake/test_cmaketoolchain.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conan/tools/cmake/toolchain.py b/conan/tools/cmake/toolchain.py index b1168ebc354..631cbbc3620 100644 --- a/conan/tools/cmake/toolchain.py +++ b/conan/tools/cmake/toolchain.py @@ -319,7 +319,8 @@ class AppleSystemBlock(Block): # but full path is necessary for others set(CMAKE_OSX_SYSROOT {{ CMAKE_OSX_SYSROOT }} CACHE STRING "" FORCE) {% if CMAKE_OSX_DEPLOYMENT_TARGET is defined %} - set(CMAKE_OSX_DEPLOYMENT_TARGET {{ CMAKE_OSX_DEPLOYMENT_TARGET }}) + # Setting CMAKE_OSX_DEPLOYMENT_TARGET if "os.version" is defined by the used conan profile + set(CMAKE_OSX_DEPLOYMENT_TARGET "{{ CMAKE_OSX_DEPLOYMENT_TARGET }}" CACHE STRING "") {% endif %} """) diff --git a/conans/test/unittests/tools/cmake/test_cmaketoolchain.py b/conans/test/unittests/tools/cmake/test_cmaketoolchain.py index 081d518c686..d9a285e2e30 100644 --- a/conans/test/unittests/tools/cmake/test_cmaketoolchain.py +++ b/conans/test/unittests/tools/cmake/test_cmaketoolchain.py @@ -164,4 +164,4 @@ def conanfile_apple(): def test_osx_deployment_target(conanfile_apple): toolchain = CMakeToolchain(conanfile_apple) content = toolchain.content - assert 'set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)' in content + assert 'set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "")' in content