Skip to content

Commit 251abb8

Browse files
authored
Merge pull request doxygen#11850 from irieger/bugfix/handle-osx-deployment-target
Fix handling of CMAKE_OSX_DEPLOYMENT_TARGET
2 parents 8bd7fc6 + ca365b5 commit 251abb8

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
@@ -71,8 +71,6 @@ endif()
7171

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

74-
if (NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
75-
set(MACOS_VERSION_MIN 10.14)
7674
if(use_libclang)
7775
set(clang "1" CACHE INTERNAL "used in settings.h")
7876
find_package(LLVM CONFIG REQUIRED)
@@ -87,12 +85,15 @@ endif()
8785
if(use_sys_sqlite3)
8886
find_package(SQLite3 REQUIRED)
8987
endif()
90-
if(build_search AND CMAKE_SYSTEM MATCHES "Darwin")
91-
set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
92-
endif()
93-
if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
94-
set(MACOS_VERSION_MIN 11.0) # needs Qt
95-
endif()
88+
89+
if(NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
90+
set(MACOS_VERSION_MIN 10.14)
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()
9697
endif()
9798

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

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

0 commit comments

Comments
 (0)