diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:09:11 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:09:11 -0700 |
| commit | 13655eae460ad2a103afb97614f016305b16fed3 (patch) | |
| tree | 725ec985d1d9919beccb0ee3e08a126887fdedc6 | |
| parent | 8b8bb0cb3dedf3e00d8846c68fa7bf085f377c31 (diff) | |
| download | navit-13655eae460ad2a103afb97614f016305b16fed3.tar.gz | |
Fixed typos
| -rwxr-xr-x | Toolchain/arm-eabi.cmake | 6 | ||||
| -rwxr-xr-x | Toolchain/i686-android.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake index 7c8190667..5aec27692 100755 --- a/Toolchain/arm-eabi.cmake +++ b/Toolchain/arm-eabi.cmake @@ -1,8 +1,8 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) -set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") -set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") +set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version") +set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version") set(ANDROID_ARCH "armeabi" CACHE STRING "Android architecture") find_program(CMAKE_C_COMPILER NAMES arm-eabi-gcc arm-eabi-gcc.exe arm-linux-androideabi-gcc arm-linux-androideabi-gcc.exe) @@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "arm-eabi-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK") +set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK") set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 2b6e8a177..4f5630644 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -1,8 +1,8 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) -set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") -set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") +set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version") +set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version") set(ANDROID_ARCH "x86" CACHE STRING "Android architecture") find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe) @@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK") +set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK") set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) |