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 68259f4f63f4afb5f591c888cdd6f7f194339213 (commit) via 815a6a2e5c5c02492f97fe37eab7594ceb1e0408 (commit) from 285c69b4072bf2e3855d1216ecbecdab2a1f97f2 (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=68259f4f63f4afb5f591c888cdd6f7f194339213 commit 68259f4f63f4afb5f591c888cdd6f7f194339213 Merge: 285c69b 815a6a2 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Jan 26 12:20:17 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jan 26 12:20:17 2012 -0500 Merge topic 'improve-findtiff' into next 815a6a2 FindTIFF: support version selection http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=815a6a2e5c5c02492f97fe37eab7594ceb1e0408 commit 815a6a2e5c5c02492f97fe37eab7594ceb1e0408 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Jan 26 18:19:06 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Thu Jan 26 18:19:31 2012 +0100 FindTIFF: support version selection diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index 714f65f..16f9e23 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -25,10 +25,21 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h) SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff tiff3 libtiff3) FIND_LIBRARY(TIFF_LIBRARY NAMES ${TIFF_NAMES} ) +IF(TIFF_INCLUDE_DIR AND EXISTS "${TIFF_INCLUDE_DIR}/tiffvers.h") + FILE(STRINGS "${TIFF_INCLUDE_DIR}/tiffvers.h" tiff_version_str + REGEX "^#define[\t ]+TIFFLIB_VERSION_STR[\t ]+\"LIBTIFF, Version .*") + + STRING(REGEX REPLACE "^#define[\t ]+TIFFLIB_VERSION_STR[\t ]+\"LIBTIFF, Version +([^ \\n]*).*" + "\\1" TIFF_VERSION_STRING "${tiff_version_str}") + UNSET(tiff_version_str) +ENDIF() + # handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if # all listed variables are TRUE INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_LIBRARY TIFF_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF + REQUIRED_VARS TIFF_LIBRARY TIFF_INCLUDE_DIR + VERSION_VAR TIFF_VERSION_STRING) IF(TIFF_FOUND) SET( TIFF_LIBRARIES ${TIFF_LIBRARY} ) ----------------------------------------------------------------------- Summary of changes: Modules/FindTIFF.cmake | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits