diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-09-05 10:07:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 10:07:06 -0700 |
| commit | 063e2c7ebdc1771de1bc7da7012ab2e2d6041540 (patch) | |
| tree | fcd14f3262846b67d7c70aca8d2f1debb8dfd669 /CMakeLists.txt | |
| parent | 4c89accc118cfc5b6dfe4f8913d2d8c3dc189b99 (diff) | |
| download | navit-063e2c7ebdc1771de1bc7da7012ab2e2d6041540.tar.gz | |
Upgrade to CircleCI v2 (#310)
* Switching to circleci v2
* Only build for Linux for now
* Sudo is not required anymore
* Update before installing packages
* Cope with non interactive terminals
* Use ci's working_directory
* Fixed typo
* Disable QT5 for now
* Build for more platforms
* Fixed workflow definition
* sudo is not required anymore
* Update before installing
* Install wget when building for tomtom
* Revert to 14.04 base image
* Install unzip for build_tomtom_*
* Install wget for build_android_*
* Install wget for build_android_*
* Install cmake for win32 build
* Install gettext for the win32 build
* Install build-essential for tomtom builds
* Setup common requirements
* Install packages to build tt environment
install packages need to build tt environment
correct navit path
remove arm-genmarshal which disturbing a second build run
* Splitting the tomtom builds into more steps
* Splitting the tomtom builds into more steps
* Working on the tomtom minimal build
* Fixed some paths issues for tomtom_minimal
* Added missing exports for tomtom_minimal
* Added missing tomtom requirements
* Save the result of the tomtom_minimal build
* Fixing the tomtom plugin build for CI v2
* Fixed job name misconfiguration
* Use less relative paths
* Fixed espeakdsp.c path
* Adding tomtom assets
* Removed superfluous popd
* Fixed contrib path
* Adding tomtom assets
* Compile espeakdsp directly to the correct path
* Compile espeakdsp directly to the correct path
* Compile espeakdsp directly to the correct path
* Recursively copy contrib/tomtom assets
* Fixed tomtom specific icons path
* Preparing the android ARM build for CI v2
* Adapting build path
* Added missing packages for android builds
* Updating android x86 scripts for ci v2
* Android-25 will require jdk-8
* Install openjdk-8 for Ubuntu 14.04
* Ensures that add-apt is available for android builds
* Cope with non interactive terminals
* Ensures that openjdk-7 isn't installed
* Updated artifacts for ci v2 / android arm
* Fixed apk path for ci_v2
* Fixed leftovers path for ci_v2
* Fixed artifacts path for android arm
* Fixed typos
* Fixed toolchain misconfiguration
* Specify android's api/nkd api versions
* Fixed apk path for ci_v2
* Store android/x86 artifacts
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7a6f6418..3d5924582 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -704,9 +704,9 @@ if(ANDROID) set(XSLTS "android;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") list(APPEND NAVIT_LIBS log) set(HAVE_API_ANDROID 1) - set_with_reason(graphics/android "Android detected" TRUE) - set_with_reason(speech/android "Android detected" TRUE) - set_with_reason(vehicle/android "Android detected" TRUE) + set_with_reason(graphics/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) + set_with_reason(speech/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) + set_with_reason(vehicle/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) set(SHARED_LIBNAVIT TRUE) add_feature(XPM2PNG "Android detected" TRUE) |