summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-09-17 13:32:37 +0000
committerKitware Robot <kwrobot@kitware.com>2021-09-17 09:32:49 -0400
commit58ac1eaa701c75d5b7a9f06e732ea403208cc4b3 (patch)
tree2bd198f3882dd2a503a9b5002d4c27b75c4f3820
parent64aac043eed8a58e69b1b7952086cdfa73cd3cac (diff)
parentf77ffbc0e3933dd1247fb20c364452fe0f4f1505 (diff)
downloadcmake-58ac1eaa701c75d5b7a9f06e732ea403208cc4b3.tar.gz
Merge topic 'iar-enable-in-list-operator' into release-3.21
f77ffbc0e3 IAR: Restore support for projects not enabling policy CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6527
-rw-r--r--Modules/CMakeFindBinUtils.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index bb97f4a225..27d9131c83 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -20,6 +20,9 @@
# on UNIX, cygwin and mingw
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
# Resolve full path of CMAKE_TOOL from user-defined name and SEARCH_PATH.
function(__resolve_tool_path CMAKE_TOOL SEARCH_PATH DOCSTRING)
@@ -240,3 +243,5 @@ if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIAR$")
set(CMAKE_IAR_LINKER "${CMAKE_LINKER}" CACHE FILEPATH "The IAR ILINK linker")
mark_as_advanced(CMAKE_IAR_LINKER CMAKE_IAR_AR)
endif()
+
+cmake_policy(POP)