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:28 (GMT) |
| commit | 21d409534a6ee884db9740f1e16f7d3d6bb950d8 (patch) | |
| tree | 739956303f95ec6cb609eebf792fc0501fd4e944 | |
| parent | e12d6d2503ee0099783bd7b97e39b973cfd212e7 (diff) | |
| parent | 7b205b7078799d3583725e146fa48123a0036d27 (diff) | |
| download | CMake-21d409534a6ee884db9740f1e16f7d3d6bb950d8.zip CMake-21d409534a6ee884db9740f1e16f7d3d6bb950d8.tar.gz CMake-21d409534a6ee884db9740f1e16f7d3d6bb950d8.tar.bz2 | |
Merge topic 'rel-macos-c++17' into release-3.27
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
| -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 "") |