diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-01 19:47:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-01 19:47:57 (GMT) |
| commit | 3f7cea092bd821801c69496fd22097f1eb2dba7e (patch) | |
| tree | 8916130c15dc5540009be2e19f34a0cfea814e3d /Modules | |
| parent | fa6816bd71bddcc6a018da062efe0a262edb74bd (diff) | |
| parent | 815a6a2e5c5c02492f97fe37eab7594ceb1e0408 (diff) | |
| download | CMake-3f7cea092bd821801c69496fd22097f1eb2dba7e.zip CMake-3f7cea092bd821801c69496fd22097f1eb2dba7e.tar.gz CMake-3f7cea092bd821801c69496fd22097f1eb2dba7e.tar.bz2 | |
Merge topic 'improve-findtiff'
815a6a2 FindTIFF: support version selection
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindTIFF.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
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} ) |