From 6240d9632930df7fe15aa5647e6131722c0f50c6 Mon Sep 17 00:00:00 2001 From: rikky Date: Wed, 31 Aug 2011 21:43:46 +0000 Subject: Fix:build/cmake:Fix building with android NDK 6 git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4738 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- Toolchain/arm-eabi.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Toolchain') diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake index cd609204..9566ad5b 100644 --- a/Toolchain/arm-eabi.cmake +++ b/Toolchain/arm-eabi.cmake @@ -3,8 +3,8 @@ set(CMAKE_SYSTEM_NAME GNU) set(ANDROID TRUE) set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version") -find_program(CMAKE_C_COMPILER arm-linux-androideabi-gcc arm-eabi-gcc arm-eabi-gcc.exe) -find_program(CMAKE_CXX_COMPILER arm-linux-androideabi-gcc arm-eabi-gcc arm-eabi-g++.exe) +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) set(PKG_CONFIG_EXECUTABLE "arm-eabi-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) -- cgit v1.2.1