From 488e5508959573b4b84a4f03afc7589503cd0af1 Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Fri, 27 Mar 2020 12:53:27 +0200 Subject: [PATCH] [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. --- circle.yml | 8 ++++---- platform/ios/ios.cmake | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index bf86a9807..bc91cca9c 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 8b5696e48..984b15840 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()