From a45e97363bdb7fe27f3246f7fcf521b40325bebf Mon Sep 17 00:00:00 2001 From: martin-s Date: Fri, 30 Sep 2011 09:20:20 +0000 Subject: [PATCH] Add:Build:Option to disable broken c++ compilers git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4806 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/CMakeLists.txt | 4 +++- navit/Toolchain/i686-android.cmake | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 40be943..a398044 100755 --- a/navit/CMakeLists.txt +++ b/navit/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/navit/Toolchain/i686-android.cmake b/navit/Toolchain/i686-android.cmake index 977a4e9..94c6197 100755 --- a/navit/Toolchain/i686-android.cmake +++ b/navit/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") -- 2.7.4