浏览代码

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 <[email protected]>
Merge-request: !6527
Brad King 4 年之前
父节点
当前提交
58ac1eaa70
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      Modules/CMakeFindBinUtils.cmake

+ 5 - 0
Modules/CMakeFindBinUtils.cmake

@@ -20,6 +20,9 @@
 
 
 # on UNIX, cygwin and mingw
 # 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.
 # Resolve full path of CMAKE_TOOL from user-defined name and SEARCH_PATH.
 function(__resolve_tool_path CMAKE_TOOL SEARCH_PATH DOCSTRING)
 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")
   set(CMAKE_IAR_LINKER "${CMAKE_LINKER}" CACHE FILEPATH "The IAR ILINK linker")
   mark_as_advanced(CMAKE_IAR_LINKER CMAKE_IAR_AR)
   mark_as_advanced(CMAKE_IAR_LINKER CMAKE_IAR_AR)
 endif()
 endif()
+
+cmake_policy(POP)