Skip to content

Commit ca365b5

Browse files
committed
Fix handling of CMAKE_OSX_DEPLOYMENT_TARGET
Don't force-set CMAKE_OSX_DEPLOYMENT_TARGET overriding possibly set version from toolchain.
1 parent da7b340 commit ca365b5

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

CMakeLists.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ endif()
7272

7373
set(clang "0" CACHE INTERNAL "used in settings.h")
7474

75-
if (NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
76-
set(MACOS_VERSION_MIN 10.14)
7775
if(use_libclang)
7876
set(clang "1" CACHE INTERNAL "used in settings.h")
7977
find_package(LLVM CONFIG REQUIRED)
@@ -88,12 +86,15 @@ endif()
8886
if(use_sys_sqlite3)
8987
find_package(SQLite3 REQUIRED)
9088
endif()
91-
if(build_search AND CMAKE_SYSTEM MATCHES "Darwin")
92-
set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
93-
endif()
94-
if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
95-
set(MACOS_VERSION_MIN 11.0) # needs Qt
96-
endif()
89+
90+
if(NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
91+
set(MACOS_VERSION_MIN 10.14)
92+
if(build_search AND CMAKE_SYSTEM MATCHES "Darwin")
93+
set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
94+
endif()
95+
if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
96+
set(MACOS_VERSION_MIN 11.0) # needs Qt
97+
endif()
9798
endif()
9899

99100
# use C++17 standard for compiling (unless very new Clang is present)
@@ -123,9 +124,9 @@ endif()
123124
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
124125

125126
if(CMAKE_SYSTEM MATCHES "Darwin")
126-
set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION_MIN}" CACHE STRING "Minimum OS X deployment version" FORCE)
127-
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_CXX_FLAGS}")
128-
set(CMAKE_C_FLAGS "-Wno-deprecated-register -mmacosx-version-min=${MACOS_VERSION_MIN} ${CMAKE_C_FLAGS}")
127+
set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION_MIN}" CACHE STRING "Minimum OS X deployment version")
128+
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register ${CMAKE_CXX_FLAGS}")
129+
set(CMAKE_C_FLAGS "-Wno-deprecated-register ${CMAKE_C_FLAGS}")
129130
find_library(CORESERVICES_LIB CoreServices)
130131
set(EXTRA_LIBS ${CORESERVICES_LIB})
131132
endif()

0 commit comments

Comments
 (0)