Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 15:32:10 +08:00
Code Issues Projects Releases Wiki Activity

ci: do not use sccache for macOS packaging

Browse Source 
It is not compatible with building for multiple architectures.
This commit is contained in:
Brad King
2020-12-10 10:30:30 -05:00
parent 41bddf1028
commit b184cc256b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/configure_common.cmake
View File

@@ -10,4 +10,6 @@ if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE "$ENV{CMAKE_BUILD_TYPE}" CACHE STRING "") set(CMAKE_BUILD_TYPE "$ENV{CMAKE_BUILD_TYPE}" CACHE STRING "")
endif () endif ()
include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake") if (NOT configure_no_sccache)
include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake")
endif()

4
.gitlab/ci/configure_macos_package.cmake
View File

@@ -20,5 +20,9 @@ set(CMake_INSTALL_DEPENDENCIES "ON" CACHE BOOL "")
set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "") set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "")
set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "") set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "")
# XXX(sccache): restore sccache when it works for multiple architectures:
# https://github.com/mozilla/sccache/issues/847
set(configure_no_sccache 1)
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")

5
.gitlab/os-macos.yml
View File

@@ -115,13 +115,8 @@
script: script:
- *before_script_macos - *before_script_macos
- .gitlab/ci/sccache.sh
# Allow the server to already be running.
- "sccache --start-server || :"
- sccache --show-stats
- ctest -VV -S .gitlab/ci/ctest_configure.cmake - ctest -VV -S .gitlab/ci/ctest_configure.cmake
- ctest -VV -S .gitlab/ci/ctest_build.cmake - ctest -VV -S .gitlab/ci/ctest_build.cmake
- sccache --show-stats
- cd build - cd build
- cpack -G TGZ - cpack -G TGZ
- cpack -G DragNDrop - cpack -G DragNDrop