diff options
| author | Andrey Kamaev <andrey.kamaev@itseez.com> | 2015-05-17 16:15:11 +0300 |
|---|---|---|
| committer | Andrey Kamaev <andrey.kamaev@itseez.com> | 2015-05-17 16:15:11 +0300 |
| commit | 556cc14296c226f753a3778d99d8b60778b7df4f (patch) | |
| tree | 86b18f27c4d4532b4fb8ebc98ba98241b37a7d44 | |
| parent | 9ff14407e9b40603fcb94da84b00a8cd5463c615 (diff) | |
| parent | 75eb74f2ddf181ba2378e0e2fa6235991d7cd8e3 (diff) | |
| download | android-cmake-upstream-master.tar.gz | |
Merge pull request #47 from OSVR/apparent-typo-fixupstream-master
Fix an apparent typo involved in detecting toolchains.
| -rw-r--r-- | android.toolchain.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android.toolchain.cmake b/android.toolchain.cmake index 8cc6551..ffa2612 100644 --- a/android.toolchain.cmake +++ b/android.toolchain.cmake @@ -598,7 +598,7 @@ if( BUILD_WITH_ANDROID_NDK ) endif() if( NOT __availableToolchains ) file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) - if( __availableToolchains ) + if( __availableToolchainsLst ) list(SORT __availableToolchainsLst) # we need clang to go after gcc endif() __LIST_FILTER( __availableToolchainsLst "^[.]" ) |