diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-20 13:26:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-20 13:26:29 (GMT) |
| commit | 15edabf575da40b7d656d767fb6deba63ae3a611 (patch) | |
| tree | c73437c819dfce501cba65121e1f798933ab0257 /.gitlab | |
| parent | 093dd920ce6276bdaaaf9b6089d09904eabfdd73 (diff) | |
| parent | 7b205b7078799d3583725e146fa48123a0036d27 (diff) | |
| download | CMake-15edabf575da40b7d656d767fb6deba63ae3a611.zip CMake-15edabf575da40b7d656d767fb6deba63ae3a611.tar.gz CMake-15edabf575da40b7d656d767fb6deba63ae3a611.tar.bz2 | |
Merge topic 'rel-macos-c++17'
7b205b7078 ci: Build macOS 10.13+ package as C++17
7f6cebb1cd ci: Split macOS 10.10+ and 10.13+ package language standard selection
aab16d4bfc ci: Drop unnecessary -stdlib flag from macOS package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8567
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 | 3 |
3 files changed, 4 insertions, 3 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..cdc8fd2 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 "17" 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 8aab41b..2ac7ad6 100644 --- a/.gitlab/ci/configure_macos_package_common.cmake +++ b/.gitlab/ci/configure_macos_package_common.cmake @@ -6,9 +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_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(BUILD_CursesDialog "ON" CACHE BOOL "") set(BUILD_QtDialog "TRUE" CACHE BOOL "") |