summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-10-07 16:17:36 -0700
committerHaibo Huang <hhb@google.com>2020-10-07 16:17:36 -0700
commit91a362d2fa938f02366737a791d298a6781a9aa8 (patch)
tree3a79af533b5081660a9f768aced2d70f3900c77f /Modules
parent0b082c5253239351ab022a0509e8e5c3b43282bc (diff)
downloadcmake-91a362d2fa938f02366737a791d298a6781a9aa8.tar.gz
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Android-Determine.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake
index 59056f1c4a..ef97c23048 100644
--- a/Modules/Platform/Android-Determine.cmake
+++ b/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)