summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-03-01 13:59:04 (GMT)
committerBrad King <brad.king@kitware.com>2024-03-01 13:59:04 (GMT)
commitd16ac6f801224b8d35aabacf64ea7301df396c8c (patch)
treef532f763a1221c49ad754b860b92024f9a75e8a9
parent81a8cf2410efa43955c865d63a8993551032361e (diff)
parentb6b2f73f36a89161a4833846ec64a52c07e53b4d (diff)
downloadCMake-d16ac6f801224b8d35aabacf64ea7301df396c8c.zip
CMake-d16ac6f801224b8d35aabacf64ea7301df396c8c.tar.gz
CMake-d16ac6f801224b8d35aabacf64ea7301df396c8c.tar.bz2
Merge topic 'FindTIFF-cmake-package' into release-3.28
b6b2f73f36 FindTIFF: Fix name of upstream TIFF cmake package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9300
-rw-r--r--Modules/FindTIFF.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake
index 58514a4..fe1e94e 100644
--- a/Modules/FindTIFF.cmake
+++ b/Modules/FindTIFF.cmake
@@ -100,9 +100,9 @@ if (_TIFF_component_opt)
endif ()
unset(_TIFF_component_opt)
# Always find with QUIET to avoid noise when it is not found.
-find_package(tiff CONFIG QUIET ${_TIFF_args})
+find_package(Tiff CONFIG QUIET ${_TIFF_args})
unset(_TIFF_args)
-if (tiff_FOUND)
+if (Tiff_FOUND)
if (NOT TARGET TIFF::TIFF)
add_library(TIFF::TIFF IMPORTED INTERFACE)
set_target_properties(TIFF::TIFF PROPERTIES
@@ -201,15 +201,16 @@ if (tiff_FOUND)
endif ()
endif ()
endif ()
- set(TIFF_VERSION_STRING "${tiff_VERSION}")
+ set(TIFF_VERSION_STRING "${Tiff_VERSION}")
foreach (_TIFF_component IN LISTS TIFF_FIND_COMPONENTS)
- set(TIFF_${_TIFF_component}_FOUND "${tiff_${_TIFF_component}_FOUND}")
+ set(TIFF_${_TIFF_component}_FOUND "${Tiff_${_TIFF_component}_FOUND}")
endforeach ()
unset(_TIFF_component)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
find_package_handle_standard_args(TIFF
HANDLE_COMPONENTS
+ REQUIRED_VARS Tiff_DIR
VERSION_VAR TIFF_VERSION_STRING)
cmake_policy(POP)