diff options
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | Toolchain/i686-android.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 40be9439..a3980441 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,9 @@ project(navit C) if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND) endif(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") -enable_language(CXX OPTIONAL) +if (NOT DISABLE_CXX) + enable_language(CXX OPTIONAL) +endif(NOT DISABLE_CXX) cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.6) diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 977a4e9b..94c6197e 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) -set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version") +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_ARCH "x86" CACHE STRING "Android architecture") |