generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: always sort list of NDK toolchains

Browse Source 
Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
This commit is contained in:
Andrey Kamaev 2012-11-27 18:14:59 +04:00
parent 03f402892d
commit cbe22fb5d1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/android.toolchain.cmake
View File

@ -596,6 +596,9 @@ if( BUILD_WITH_ANDROID_NDK )
endif() endif()
if( NOT __availableToolchains ) if( NOT __availableToolchains )
file( GLOB __availableToolchains RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" ) file( GLOB __availableToolchains RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" )
if( __availableToolchains )
list(SORT __availableToolchains) # we need clang to go after gcc
endif()
__LIST_FILTER( __availableToolchains "^[.]" ) __LIST_FILTER( __availableToolchains "^[.]" )
__LIST_FILTER( __availableToolchains "llvm" ) __LIST_FILTER( __availableToolchains "llvm" )
__GLOB_NDK_TOOLCHAINS( __availableToolchains ) __GLOB_NDK_TOOLCHAINS( __availableToolchains )