mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 21:59:54 -06:00
Merge topic 'FindTIFF-pre-CMP0057'
84930e9a4c FindTIFF: Restore support for projects that do not enable CMP0057
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9073
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user