equal
deleted
inserted
replaced
30 else () |
30 else () |
31 MESSAGE(FATAL_ERROR "Couldn't detect the Android NDK directory") |
31 MESSAGE(FATAL_ERROR "Couldn't detect the Android NDK directory") |
32 endif() |
32 endif() |
33 |
33 |
34 if(NOT ANDROID_NDK_TOOLCHAINDIR) |
34 if(NOT ANDROID_NDK_TOOLCHAINDIR) |
35 set(toolchainbase "${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt") |
35 set(toolchainbase "${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.6/prebuilt") |
36 find_path(ANDROID_NDK_TOOLCHAINDIR arm-linux-androideabi |
36 find_path(ANDROID_NDK_TOOLCHAINDIR arm-linux-androideabi |
37 "${toolchainbase}/linux-x86" |
37 "${toolchainbase}/linux-x86" |
38 "${toolchainbase}/windows") |
38 "${toolchainbase}/windows") |
39 endif() |
39 endif() |
40 |
40 |