Browse Source

Android: Drop redundant setting of CMP0057 in Android-Determine

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.
pull/336/head
Haibo Huang 5 years ago
parent
commit
91a362d2fa
  1. 3
      Modules/Platform/Android-Determine.cmake

3
Modules/Platform/Android-Determine.cmake

@ -320,15 +320,12 @@ if(NOT CMAKE_ANDROID_ARCH_ABI)
# Choose the oldest among the available arm ABIs.
if(_ANDROID_ABIS)
list(REMOVE_DUPLICATES _ANDROID_ABIS)
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW)
foreach(abi armeabi armeabi-v7a arm64-v8a)
if("${abi}" IN_LIST _ANDROID_ABIS)
set(CMAKE_ANDROID_ARCH_ABI "${abi}")
break()
endif()
endforeach()
cmake_policy(POP)
endif()
unset(_ANDROID_ABIS)

Loading…
Cancel
Save