diff options
| author | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-03-15 12:54:15 +0700 |
|---|---|---|
| committer | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-03-15 12:54:15 +0700 |
| commit | 43c76f60e20a918483801f56bc7d38ddad0909d6 (patch) | |
| tree | 55baa04c80d322d727c26151e9a9c0448fdc692a | |
| parent | a19fa1f983001e57726b423446073897c283d1ba (diff) | |
[cmake] update properties for macOS builds
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 770b7f4c1d..5a4e2524c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,8 +300,10 @@ IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF(APPLE) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra -Wno-unused-parameter") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Wall -Wextra -Wno-unknown-warning-option") - # We support only 64 bits macOS - SET(CMAKE_OSX_ARCHITECTURES "x86_64") + # macOS architectures: x86_64 or arm64 (default: x86_64) + IF(NOT CMAKE_OSX_ARCHITECTURES) + SET(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "macOS architectures" FORCE) + ENDIF() ENDIF() ENDIF() @@ -783,9 +785,9 @@ IF(APPLE) FIND_PROGRAM(MACDEPLOYQT_COMMAND macdeployqt HINTS "${_qt_bin_dir}") IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET) - SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE) + SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum macOS deployment version" FORCE) ENDIF() - MESSAGE(STATUS "Mac OS X deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET}") + MESSAGE(STATUS "macOS deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET} (${CMAKE_OSX_ARCHITECTURES})") SET(PACKAGE_OSX_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) ADD_DEFINITIONS(-DPACKAGE_OSX_TARGET) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Info.plist.cmake ${CMAKE_SOURCE_DIR}/data/Info.plist @ONLY) |