Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[build] Enable ccache for iOS CI builds
Browse files Browse the repository at this point in the history
Now ccache can be optionally enabled. Enable it for CI builds.
By default it is disabled due to issues in some environments.
  • Loading branch information
Juha Alanen committed Mar 27, 2020
1 parent 7cf5350 commit 488e550
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 4 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ workflows:
name: ios-xcode11-release
executor_name: macos-11_3_1
target_is_macos: true
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64e -DCMAKE_OSX_SYSROOT=iphoneos'
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64e -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_WITH_IOS_CCACHE=ON'
build_params: '--config Release'
nightly:
triggers:
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:
- prepare-ios-codesign-keychain:
directory: render-test/ios
- config:
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_RENDER_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e'
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_RENDER_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e -DMBGL_WITH_IOS_CCACHE=ON'
- build:
build_params: '--config Release'
- codesign-ios-test-runner:
Expand Down Expand Up @@ -478,7 +478,7 @@ jobs:
- prepare-ios-codesign-keychain:
directory: test/ios
- config:
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_UNIT_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e'
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_UNIT_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e -DMBGL_WITH_IOS_CCACHE=ON'
- build:
build_params: '--config Release'
- codesign-ios-test-runner:
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
- prepare-ios-codesign-keychain:
directory: benchmark/ios
- config:
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_BENCHMARK=ON -DCMAKE_OSX_ARCHITECTURES=arm64e'
config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_BENCHMARK=ON -DCMAKE_OSX_ARCHITECTURES=arm64e -DMBGL_WITH_IOS_CCACHE=ON'
- build:
build_params: '--config Release'
- codesign-ios-test-runner:
Expand Down
6 changes: 5 additions & 1 deletion platform/ios/ios.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
option(MBGL_WITH_IOS_CCACHE "Enable ccache for iOS" OFF)

if(NOT DEFINED IOS_DEPLOYMENT_TARGET)
set(IOS_DEPLOYMENT_TARGET "9.0")
endif()
Expand Down Expand Up @@ -73,7 +75,9 @@ target_include_directories(
)

include(${PROJECT_SOURCE_DIR}/vendor/icu.cmake)
# include(${PROJECT_SOURCE_DIR}/platform/ios/ccache.cmake)
if(MBGL_WITH_IOS_CCACHE)
include(${PROJECT_SOURCE_DIR}/platform/ios/ccache.cmake)
endif()
if(MBGL_WITH_OPENGL)
include(${PROJECT_SOURCE_DIR}/platform/ios/ios-test-runners.cmake)
endif()
Expand Down

0 comments on commit 488e550

Please sign in to comment.