diff options
| author | Simon Hausmann <hausmann@gmail.com> | 2018-07-03 15:20:13 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-03 06:20:13 -0700 |
| commit | 929f2d9b9b78ce291554b3980c88155639617f80 (patch) | |
| tree | fb184c5003fb3b09f6612059208c03d61e72b774 /scripts/toolchains | |
| parent | 27149bb785f77f3ce878fc7759df9faf9e3ea6bc (diff) | |
| download | vcpkg-929f2d9b9b78ce291554b3980c88155639617f80.tar.gz vcpkg-929f2d9b9b78ce291554b3980c88155639617f80.zip | |
Make locating the Android NDK configurable (#3754)
Prefer an environment variable and fall back to the previous path if not
set.
Diffstat (limited to 'scripts/toolchains')
| -rw-r--r-- | scripts/toolchains/android.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 2a37e4c39..355ccc3ac 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -6,8 +6,14 @@ set(ANDROID_TOOLCHAIN clang CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "")
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "")
-if(NOT EXISTS "$ENV{ProgramData}/Microsoft/AndroidNDK64/android-ndk-r13b/build/cmake/android.toolchain.cmake")
- message(FATAL_ERROR "Could not find android ndk. Searched at $ENV{ProgramData}/Microsoft/AndroidNDK64/android-ndk-r13b")
+if(DEFINED ENV{ANDROID_NDK_HOME})
+ set(ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME})
+else()
+ set(ANDROID_NDK_HOME "$ENV{ProgramData}/Microsoft/AndroidNDK64/android-ndk-r13b/")
endif()
-include("$ENV{ProgramData}/Microsoft/AndroidNDK64/android-ndk-r13b/build/cmake/android.toolchain.cmake")
+if(NOT EXISTS "${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
+ message(FATAL_ERROR "Could not find android ndk. Searched at ${ANDROID_NDK_HOME}")
+endif()
+
+include("${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
|