diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-12-20 17:05:50 +0100 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-12-21 00:38:41 +0100 |
| commit | 6d876f1d6bf95827598809b965ed6a6e06008675 (patch) | |
| tree | 0b95cd106a739f2e1f6faa6072b3327f99f49ebf /circle.yml | |
| parent | d009ce88e012eba46bd4f30b21ab32bc53020f8a (diff) | |
| download | qtlocation-mapboxgl-6d876f1d6bf95827598809b965ed6a6e06008675.tar.gz | |
[build] Make the configuration simpler
Moved the Android flags to the compilation options interface
and removed build options we are not using and go back to CMake
defaults.
Diffstat (limited to 'circle.yml')
| -rw-r--r-- | circle.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/circle.yml b/circle.yml index b54010f5f0..0dcbe34dc1 100644 --- a/circle.yml +++ b/circle.yml @@ -27,18 +27,21 @@ workflows: executor_name: ubuntu-disco target_is_android: true config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a' + build_params: '--target libmapbox-gl.so' install: true - next-build-template: name: next-android-x86-release executor_name: ubuntu-disco target_is_android: true config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86' + build_params: '--target libmapbox-gl.so' install: true - next-build-template: name: next-android-x86_64-release executor_name: ubuntu-disco target_is_android: true config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64' + build_params: '--target libmapbox-gl.so' install: true - next-build-template: name: next-linux-gcc8-release |