summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-12-14 15:02:38 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-12-14 15:02:49 (GMT)
commit146c75a557e62cf4bbc681dd9c9b5c0efd722464 (patch)
tree20a51a687c4f188aad85d27b2588689a2a27468e /Modules
parent4ba15ae3f3495774f635b485af048a8bf63de1fc (diff)
parent84930e9a4c9031c0b0abb5d42cce979466bfc26c (diff)
downloadCMake-146c75a557e62cf4bbc681dd9c9b5c0efd722464.zip
CMake-146c75a557e62cf4bbc681dd9c9b5c0efd722464.tar.gz
CMake-146c75a557e62cf4bbc681dd9c9b5c0efd722464.tar.bz2
Merge topic 'FindTIFF-pre-CMP0057' into release-3.28
84930e9a4c FindTIFF: Restore support for projects that do not enable CMP0057 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9073
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindTIFF.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake
index 2a99314..58514a4 100644
--- a/Modules/FindTIFF.cmake
+++ b/Modules/FindTIFF.cmake
@@ -65,6 +65,9 @@ The following cache variables may also be set:
Debug and Release variants are found separately.
#]=======================================================================]
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
set(_TIFF_args)
if (TIFF_FIND_VERSION)
list(APPEND _TIFF_args
@@ -209,12 +212,10 @@ if (tiff_FOUND)
HANDLE_COMPONENTS
VERSION_VAR TIFF_VERSION_STRING)
+ cmake_policy(POP)
return ()
endif ()
-cmake_policy(PUSH)
-cmake_policy(SET CMP0057 NEW)
-
find_path(TIFF_INCLUDE_DIR tiff.h)
set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff tiff3 libtiff3)