diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2020-03-27 12:53:27 +0200 |
|---|---|---|
| committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-03-27 17:57:28 +0200 |
| commit | 488e5508959573b4b84a4f03afc7589503cd0af1 (patch) | |
| tree | 1bea535c63c2928e32f102504bb7b8432414bff8 | |
| parent | 7cf5350e3cd64323370cae27367292eea6f97ba9 (diff) | |
| download | qtlocation-mapboxgl-488e5508959573b4b84a4f03afc7589503cd0af1.tar.gz | |
[build] Enable ccache for iOS CI builds
Now ccache can be optionally enabled. Enable it for CI builds.
By default it is disabled due to issues in some environments.
| -rw-r--r-- | circle.yml | 8 | ||||
| -rw-r--r-- | platform/ios/ios.cmake | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/circle.yml b/circle.yml index bf86a9807b..bc91cca9c5 100644 --- a/circle.yml +++ b/circle.yml @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index 8b5696e481..984b15840f 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -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() @@ -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() |