From aab16d4bfcb239ef8d75ebf4a1086664d52f49a6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 Jun 2023 09:19:41 -0400 Subject: ci: Drop unnecessary -stdlib flag from macOS package AppleClang uses `libc++` by default. --- .gitlab/ci/configure_macos_package_common.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/ci/configure_macos_package_common.cmake b/.gitlab/ci/configure_macos_package_common.cmake index 8aab41b..9df88eb 100644 --- a/.gitlab/ci/configure_macos_package_common.cmake +++ b/.gitlab/ci/configure_macos_package_common.cmake @@ -6,7 +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 "") -- cgit v0.12 From 7f6cebb1cdf68366f31de6c2c6e9c7e13a2f1eb9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 Jun 2023 09:13:19 -0400 Subject: ci: Split macOS 10.10+ and 10.13+ package language standard selection Prepare to use a different language standard level for each package. --- .gitlab/ci/configure_macos10.10_package.cmake | 2 ++ .gitlab/ci/configure_macos_package.cmake | 2 ++ .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 "") -- cgit v0.12 From 7b205b7078799d3583725e146fa48123a0036d27 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 Jun 2023 09:15:25 -0400 Subject: ci: Build macOS 10.13+ package as C++17 Take advantage of the standard library implementations of those C++17 features available when targeting macOS 10.13. Note that the standard library `std::filesystem` implementation is not available until 10.15. --- .gitlab/ci/configure_macos_package.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/configure_macos_package.cmake b/.gitlab/ci/configure_macos_package.cmake index fbfa97e..cdc8fd2 100644 --- a/.gitlab/ci/configure_macos_package.cmake +++ b/.gitlab/ci/configure_macos_package.cmake @@ -1,6 +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 "") +set(CMAKE_CXX_STANDARD "17" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake") -- cgit v0.12