diff options
| -rw-r--r-- | .gitlab/artifacts.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package.cmake | 6 | ||||
| -rw-r--r-- | Help/release/3.19.rst | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index 0506e99..589b16c 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -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 diff --git a/.gitlab/ci/configure_macos_package.cmake b/.gitlab/ci/configure_macos_package.cmake index 18ef309..a1dbdb9 100644 --- a/.gitlab/ci/configure_macos_package.cmake +++ b/.gitlab/ci/configure_macos_package.cmake @@ -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 "") diff --git a/Help/release/3.19.rst b/Help/release/3.19.rst index a29dc07..899e745 100644 --- a/Help/release/3.19.rst +++ b/Help/release/3.19.rst @@ -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``. |