mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Prepare to use a different language standard level for each package.
This commit is contained in:
Brad King
2023-06-15 09:13:19 -04:00
parent aab16d4bfc
commit 7f6cebb1cd
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_macos10.10_package.cmake
+2
View File
@@ -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")
.gitlab/ci/configure_macos_package.cmake
+2
View File
@@ -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")
.gitlab/ci/configure_macos_package_common.cmake
-2
View File
@@ -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 "")