diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-29 13:03:37 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-29 13:03:37 +0000 |
| commit | 1d674c002eaa8ec63c8f87e57213aacb89fa78e0 (patch) | |
| tree | ece9c9fa4e2c541b8042ab4fa2faa000fa51e8ed /Toolchain | |
| parent | 355e94aa167d09067419c7fba38b03f4918510e1 (diff) | |
| download | navit-svn-1d674c002eaa8ec63c8f87e57213aacb89fa78e0.tar.gz | |
Add:Build:Allow different api level settings for android sdk and ndk
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4795 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
| -rwxr-xr-x | Toolchain/arm-eabi.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake index 16a21f02..f4860288 100755 --- a/Toolchain/arm-eabi.cmake +++ b/Toolchain/arm-eabi.cmake @@ -2,6 +2,7 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version") +set(ANDROID_NDK_API_VERSION ANDROID_API_VERSION CACHE STRING "Andriod NDK API Version") find_program(CMAKE_C_COMPILER NAMES arm-eabi-gcc arm-eabi-gcc.exe arm-linux-androideabi-gcc arm-linux-androideabi-gcc.exe) find_program(CMAKE_CXX_COMPILER NAMES arm-eabi-gcc arm-eabi-g++.exe arm-linux-androideabi-g++ arm-linux-androideabi-g++.exe) @@ -11,7 +12,7 @@ get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK") -set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_API_VERSION}/arch-arm") +set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib") |