mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Android: Drop redundant setting of CMP0057 in Android-Determine

Browse Source 
A module-wide setting was added by commit 8ede35523e (IN_LIST: Ensure
policy allows if(IN_LIST) if used by a module, 2018-09-12,
v3.13.0-rc1~95^2), so our local setting is no longer needed.
This commit is contained in:
Haibo Huang
2020-10-07 16:17:36 -07:00
parent 0b082c5253
commit 91a362d2fa
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Platform/Android-Determine.cmake
-3
View File
@@ -320,15 +320,12 @@ if(NOT CMAKE_ANDROID_ARCH_ABI)
# Choose the oldest among the available arm ABIs. # Choose the oldest among the available arm ABIs.
if(_ANDROID_ABIS) if(_ANDROID_ABIS)
list(REMOVE_DUPLICATES _ANDROID_ABIS) list(REMOVE_DUPLICATES _ANDROID_ABIS)
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
foreach(abi armeabi armeabi-v7a arm64-v8a) foreach(abi armeabi armeabi-v7a arm64-v8a)
if("${abi}" IN_LIST _ANDROID_ABIS) if("${abi}" IN_LIST _ANDROID_ABIS)
set(CMAKE_ANDROID_ARCH_ABI "${abi}") set(CMAKE_ANDROID_ARCH_ABI "${abi}")
break() break()
endif() endif()
endforeach() endforeach()
cmake_policy(POP)
endif() endif()
unset(_ANDROID_ABIS) unset(_ANDROID_ABIS)