[Cmake-commits] CMake branch, next, updated. v3.3.0-2225-ge3e1e3d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e3e1e3d47072b631f0a857079a6b6e362f31d9a7 (commit)
       via  724fa682705a17bef0c74b9dcf09bc9cf1761dde (commit)
       via  17ecfd8210b4db74753c4565b10a2b75dfa4c480 (commit)
      from  cdaed8a166e4ea74d1ca9ca3435bb00edbf63bbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3e1e3d47072b631f0a857079a6b6e362f31d9a7
commit e3e1e3d47072b631f0a857079a6b6e362f31d9a7
Merge: cdaed8a 724fa68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 09:54:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 14 09:54:02 2015 -0400

    Merge topic 'FindTIFF-updates' into next
    
    724fa682 FindTIFF: Find debug and release libraries separately
    17ecfd82 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=724fa682705a17bef0c74b9dcf09bc9cf1761dde
commit 724fa682705a17bef0c74b9dcf09bc9cf1761dde
Author:     Roger Leigh <rleigh at dundee.ac.uk>
AuthorDate: Fri Aug 7 13:51:42 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 14 09:49:46 2015 -0400

    FindTIFF: Find debug and release libraries separately

diff --git a/Help/release/dev/FindTIFF-updates.rst b/Help/release/dev/FindTIFF-updates.rst
new file mode 100644
index 0000000..083e40f
--- /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 a67d24d..ed092ea 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

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindTIFF-updates.rst |    5 +++++
 Modules/FindTIFF.cmake                |   14 +++++++++++++-
 Source/CMakeVersion.cmake             |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/FindTIFF-updates.rst


hooks/post-receive
-- 
CMake