-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+
In order to support modern macOS features like Dark Mode, we need to use Qt 5.15, which requires macOS 10.13. However, we still want to support macOS 10.10 as well, for which we need to use Qt 5.9. Build separate macOS packages for these use cases. Fixes: #21606 Issue: #20825
- Loading branch information
Showing
9 changed files
with
69 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
set(CPACK_SYSTEM_NAME "macos10.10-universal" CACHE STRING "") | ||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "") | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,4 @@ | ||
set(CMake_DOC_ARTIFACT_PREFIX "$ENV{CI_PROJECT_DIR}/build/install-doc" CACHE PATH "") | ||
|
||
# Set up install destinations as expected by the packaging scripts. | ||
set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "") | ||
set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") | ||
|
||
# Settings for CMake packages for macOS. | ||
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;arm64" CACHE STRING "") | ||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "") | ||
set(CMAKE_SKIP_BOOTSTRAP_TEST "TRUE" 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 "") | ||
set(CMake_INSTALL_DEPENDENCIES "ON" CACHE BOOL "") | ||
set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "") | ||
set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "") | ||
|
||
# XXX(sccache): restore sccache when it works for multiple architectures: | ||
# https://github.com/mozilla/sccache/issues/847 | ||
set(configure_no_sccache 1) | ||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "") | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") | ||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") | ||
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
set(CMake_DOC_ARTIFACT_PREFIX "$ENV{CI_PROJECT_DIR}/build/install-doc" CACHE PATH "") | ||
|
||
# Set up install destinations as expected by the packaging scripts. | ||
set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "") | ||
set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") | ||
|
||
# Settings for CMake packages for macOS. | ||
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;arm64" CACHE STRING "") | ||
set(CMAKE_SKIP_BOOTSTRAP_TEST "TRUE" CACHE STRING "") | ||
set(BUILD_CursesDialog "ON" CACHE BOOL "") | ||
set(BUILD_QtDialog "TRUE" CACHE BOOL "") | ||
set(CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL "3" CACHE STRING "") | ||
set(CMake_INSTALL_DEPENDENCIES "ON" CACHE BOOL "") | ||
set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "") | ||
set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "") | ||
|
||
# XXX(sccache): restore sccache when it works for multiple architectures: | ||
# https://github.com/mozilla/sccache/issues/847 | ||
set(configure_no_sccache 1) | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") | ||
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters