summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-26 16:46:38 (GMT)
committerBrad King <brad.king@kitware.com>2019-07-26 18:17:07 (GMT)
commitf3e32ddae94919c8dbd3df201ab8491af50dfe44 (patch)
treea01ac0de21fd72a3623e56f601db3ff0ed4b77ea /Modules
parent9a0720b819254e6676a07f8570500341d368d3e0 (diff)
downloadCMake-f3e32ddae94919c8dbd3df201ab8491af50dfe44.zip
CMake-f3e32ddae94919c8dbd3df201ab8491af50dfe44.tar.gz
CMake-f3e32ddae94919c8dbd3df201ab8491af50dfe44.tar.bz2
Android: Re-order system initialization to select sysroot last
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Android-Initialize.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Android-Initialize.cmake b/Modules/Platform/Android-Initialize.cmake
index a434f90..1dcb939 100644
--- a/Modules/Platform/Android-Initialize.cmake
+++ b/Modules/Platform/Android-Initialize.cmake
@@ -17,6 +17,8 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
return()
endif()
+set(CMAKE_BUILD_TYPE_INIT Debug)
+
if(NOT CMAKE_SYSROOT)
if(CMAKE_ANDROID_NDK)
set(CMAKE_SYSROOT "${CMAKE_ANDROID_NDK}/platforms/android-${CMAKE_SYSTEM_VERSION}/arch-${CMAKE_ANDROID_ARCH}")
@@ -40,5 +42,3 @@ else()
"Android: No CMAKE_SYSROOT was selected."
)
endif()
-
-set(CMAKE_BUILD_TYPE_INIT Debug)