1
0
Эх сурвалжийг харах

Android: Re-order system initialization to select sysroot last

Brad King 6 жил өмнө
parent
commit
f3e32ddae9

+ 2 - 2
Modules/Platform/Android-Initialize.cmake

@@ -17,6 +17,8 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
   return()
   return()
 endif()
 endif()
 
 
+set(CMAKE_BUILD_TYPE_INIT Debug)
+
 if(NOT CMAKE_SYSROOT)
 if(NOT CMAKE_SYSROOT)
   if(CMAKE_ANDROID_NDK)
   if(CMAKE_ANDROID_NDK)
     set(CMAKE_SYSROOT "${CMAKE_ANDROID_NDK}/platforms/android-${CMAKE_SYSTEM_VERSION}/arch-${CMAKE_ANDROID_ARCH}")
     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."
     "Android: No CMAKE_SYSROOT was selected."
     )
     )
 endif()
 endif()
-
-set(CMAKE_BUILD_TYPE_INIT Debug)