Просмотр исходного кода

Merge topic 'android-platform-vars' into release-3.27

ab66b89a46 Android: Restore platform id vars with legacy toolchain file

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8576
Brad King 2 лет назад
Родитель
Сommit
fd949f6e01
1 измененных файлов с 5 добавлено и 5 удалено
  1. 5 5
      Modules/Platform/Android-Initialize.cmake

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

@@ -10,6 +10,11 @@ if(CMAKE_ANDROID_NDK)
   include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android-Initialize.cmake OPTIONAL)
   include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android-Initialize.cmake OPTIONAL)
 endif()
 endif()
 
 
+include(Platform/Linux-Initialize)
+unset(LINUX)
+
+set(ANDROID 1)
+
 # Support for NVIDIA Nsight Tegra Visual Studio Edition was previously
 # Support for NVIDIA Nsight Tegra Visual Studio Edition was previously
 # implemented in the CMake VS IDE generators.  Avoid interfering with
 # implemented in the CMake VS IDE generators.  Avoid interfering with
 # that functionality for now.
 # that functionality for now.
@@ -23,11 +28,6 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
   return()
   return()
 endif()
 endif()
 
 
-include(Platform/Linux-Initialize)
-unset(LINUX)
-
-set(ANDROID 1)
-
 set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo")
 set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo")
 
 
 if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)
 if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)