Просмотр исходного кода

ci: Split macOS 10.10+ and 10.13+ package language standard selection

Prepare to use a different language standard level for each package.
Brad King 2 лет назад
Родитель
Сommit
7f6cebb1cd

+ 2 - 0
.gitlab/ci/configure_macos10.10_package.cmake

@@ -1,4 +1,6 @@
 set(CPACK_SYSTEM_NAME "macos10.10-universal" CACHE STRING "")
 set(CPACK_SYSTEM_NAME "macos10.10-universal" CACHE STRING "")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" 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")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake")

+ 2 - 0
.gitlab/ci/configure_macos_package.cmake

@@ -1,4 +1,6 @@
 set(CPACK_SYSTEM_NAME "macos-universal" CACHE STRING "")
 set(CPACK_SYSTEM_NAME "macos-universal" CACHE STRING "")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" 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")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_package_common.cmake")

+ 0 - 2
.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.
 # Settings for CMake packages for macOS.
 set(CPACK_DMG_FORMAT "UDBZ" CACHE STRING "")
 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(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
 set(BUILD_CursesDialog "ON" CACHE BOOL "")
 set(BUILD_CursesDialog "ON" CACHE BOOL "")
 set(BUILD_QtDialog "TRUE" CACHE BOOL "")
 set(BUILD_QtDialog "TRUE" CACHE BOOL "")