mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 12:11:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Re-order system initialization to select sysroot last

Browse Source
This commit is contained in:
Brad King
2019-07-26 12:46:38 -04:00
parent 9a0720b819
commit f3e32ddae9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/Android-Initialize.cmake
View File

@@ -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)