diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-10 15:17:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-10 15:55:17 (GMT) |
| commit | 56a075eb5df3fc6a1bc400e1c1322985dc1ca3c9 (patch) | |
| tree | b9c5ec9f6797217f7c82958bae47d09cb3de5f04 /.gitlab | |
| parent | b184cc256b4eb0c140accc913dd3e62e08650c74 (diff) | |
| download | CMake-56a075eb5df3fc6a1bc400e1c1322985dc1ca3c9.zip CMake-56a075eb5df3fc6a1bc400e1c1322985dc1ca3c9.tar.gz CMake-56a075eb5df3fc6a1bc400e1c1322985dc1ca3c9.tar.bz2 | |
ci: update macOS package to produce universal binaries
Update our deployment target to macOS 10.10.
This is required by Qt 5.9.
Fixes: #21565
Issue: #20825
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/artifacts.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package.cmake | 6 |
2 files changed, 4 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 "") |