Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 19:08:07 +08:00
Code Issues Projects Releases Wiki Activity

ci: update macOS package to produce universal binaries

Browse Source 
Update our deployment target to macOS 10.10.
This is required by Qt 5.9.

Fixes: #21565
Issue: #20825
This commit is contained in:
Brad King
2020-12-10 10:17:27 -05:00
parent b184cc256b
commit 56a075eb5d
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/artifacts.yml
View File

@@ -74,7 +74,7 @@
paths:
# Any packages made.
- build/cmake-*-Linux-x86_64.*
- build/cmake-*-Darwin-x86_64.*
- build/cmake-*-macos-universal.*
# Any source packages made.
- build/cmake-*.tar.gz
- build/cmake-*.zip

6
.gitlab/ci/configure_macos_package.cmake
View File

@@ -9,10 +9,10 @@ set(CPACK_DMG_FORMAT "UDBZ" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-stdlib=libc++" CACHE STRING "")
set(CMAKE_C_STANDARD "11" CACHE STRING "")
set(CMAKE_CXX_STANDARD "14" CACHE STRING "")
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "")
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "")
set(CMAKE_SKIP_BOOTSTRAP_TEST "TRUE" CACHE STRING "")
set(CPACK_SYSTEM_NAME "Darwin-x86_64" CACHE STRING "")
set(CPACK_SYSTEM_NAME "macos-universal" CACHE STRING "")
set(BUILD_CursesDialog "ON" CACHE BOOL "")
set(BUILD_QtDialog "TRUE" CACHE BOOL "")
set(CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL "3" CACHE STRING "")

9
Help/release/3.19.rst
View File

@@ -348,3 +348,12 @@ Changes made since CMake 3.19.0 include the following.
been reverted to restore behavior from CMake 3.18 and below.
* CUDA 11.1 support for Clang.
3.19.2
------
* The precompiled macOS binary provided on ``cmake.org`` is now a
universal binary with ``x86_64`` and ``arm64`` architectures.
It requires macOS 10.10 or newer.
The package file naming pattern has been changed from
``cmake-$ver-Darwin-x86_64`` to ``cmake-$ver-macos-universal``.