From 724fa682705a17bef0c74b9dcf09bc9cf1761dde Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Fri, 7 Aug 2015 13:51:42 +0000
Subject: [PATCH] FindTIFF: Find debug and release libraries separately

---
 Help/release/dev/FindTIFF-updates.rst |  5 +++++
 Modules/FindTIFF.cmake                | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/FindTIFF-updates.rst

diff --git a/Help/release/dev/FindTIFF-updates.rst b/Help/release/dev/FindTIFF-updates.rst
new file mode 100644
index 000000000..083e40f24
--- /dev/null
+++ b/Help/release/dev/FindTIFF-updates.rst
@@ -0,0 +1,5 @@
+FindTIFF-updates
+----------------
+
+* The :module:`FindTIFF` module learned to search separately for
+  debug and release variants.
diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake
index a67d24d0a..ed092eafa 100644
--- a/Modules/FindTIFF.cmake
+++ b/Modules/FindTIFF.cmake
@@ -34,7 +34,19 @@
 find_path(TIFF_INCLUDE_DIR tiff.h)
 
 set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff tiff3 libtiff3)
-find_library(TIFF_LIBRARY NAMES ${TIFF_NAMES} )
+foreach(name ${TIFF_NAMES})
+  list(APPEND TIFF_NAMES_DEBUG "${name}d")
+endforeach()
+
+if(NOT TIFF_LIBRARY)
+  find_library(TIFF_LIBRARY_RELEASE NAMES ${TIFF_NAMES})
+  find_library(TIFF_LIBRARY_DEBUG NAMES ${TIFF_NAMES_DEBUG})
+  include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+  select_library_configurations(TIFF)
+  mark_as_advanced(TIFF_LIBRARY_RELEASE TIFF_LIBRARY_DEBUG)
+endif()
+unset(TIFF_NAMES)
+unset(TIFF_NAMES_DEBUG)
 
 if(TIFF_INCLUDE_DIR AND EXISTS "${TIFF_INCLUDE_DIR}/tiffvers.h")
     file(STRINGS "${TIFF_INCLUDE_DIR}/tiffvers.h" tiff_version_str