diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-15 13:13:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-06-15 13:21:07 (GMT) |
| commit | 7f6cebb1cdf68366f31de6c2c6e9c7e13a2f1eb9 (patch) | |
| tree | 0807a13406009c1c932ff6035621a9cdc3594803 /.gitlab | |
| parent | aab16d4bfcb239ef8d75ebf4a1086664d52f49a6 (diff) | |
| download | CMake-7f6cebb1cdf68366f31de6c2c6e9c7e13a2f1eb9.zip CMake-7f6cebb1cdf68366f31de6c2c6e9c7e13a2f1eb9.tar.gz CMake-7f6cebb1cdf68366f31de6c2c6e9c7e13a2f1eb9.tar.bz2 | |
ci: Split macOS 10.10+ and 10.13+ package language standard selection
Prepare to use a different language standard level for each package.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_macos10.10_package.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package_common.cmake | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci/configure_macos10.10_package.cmake b/.gitlab/ci/configure_macos10.10_package.cmake index f01e6c8..280d91e 100644 --- a/.gitlab/ci/configure_macos10.10_package.cmake +++ b/.gitlab/ci/configure_macos10.10_package.cmake @@ -1,4 +1,6 @@ set(CPACK_SYSTEM_NAME "macos10.10-universal" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "") +set(CMAKE_C_STANDARD "11" CACHE STRING "") +set(CMAKE_CXX_STANDARD "14" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake") diff --git a/.gitlab/ci/configure_macos_package.cmake b/.gitlab/ci/configure_macos_package.cmake index 380e44c..fbfa97e 100644 --- a/.gitlab/ci/configure_macos_package.cmake +++ b/.gitlab/ci/configure_macos_package.cmake @@ -1,4 +1,6 @@ set(CPACK_SYSTEM_NAME "macos-universal" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "") +set(CMAKE_C_STANDARD "11" CACHE STRING "") +set(CMAKE_CXX_STANDARD "14" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake") diff --git a/.gitlab/ci/configure_macos_package_common.cmake b/.gitlab/ci/configure_macos_package_common.cmake index 9df88eb..2ac7ad6 100644 --- a/.gitlab/ci/configure_macos_package_common.cmake +++ b/.gitlab/ci/configure_macos_package_common.cmake @@ -6,8 +6,6 @@ set(CMAKE_DOC_DIR "doc/cmake" CACHE STRING "") # Settings for CMake packages for macOS. set(CPACK_DMG_FORMAT "UDBZ" 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(BUILD_CursesDialog "ON" CACHE BOOL "") set(BUILD_QtDialog "TRUE" CACHE BOOL "") |