diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-10 18:31:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-08-10 18:31:26 (GMT) |
| commit | ab994bfe886b85553e825b3d16a44818c0aa137e (patch) | |
| tree | 76cc80d4a000a18eb8c0b55db68ac51889a5275f /Modules | |
| parent | 499e1c9598883acf43675d4a0f76c570f9482e35 (diff) | |
| parent | 5f183caa7c4aaa49cf352df9e6d2db5ab10c9f11 (diff) | |
| download | CMake-ab994bfe886b85553e825b3d16a44818c0aa137e.zip CMake-ab994bfe886b85553e825b3d16a44818c0aa137e.tar.gz CMake-ab994bfe886b85553e825b3d16a44818c0aa137e.tar.bz2 | |
Merge topic 'findzlib_use_fphsa'
5f183ca FindZLIB: use the FPHSA version mode
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindZLIB.cmake | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index fa991f1..3891be4 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -62,21 +62,8 @@ ENDIF() # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY) - -# handle the VERSION provided in find_package() command -if(ZLIB_FIND_VERSION) - if(ZLIB_FIND_VERSION_EXACT AND NOT ${ZLIB_VERSION_STRING} VERSION_EQUAL ${ZLIB_FIND_VERSION}) - message(FATAL_ERROR "ZLIB version found (${ZLIB_VERSION_STRING}) does not match the required one (${ZLIB_FIND_VERSION}), aborting.") - elseif(${ZLIB_VERSION_STRING} VERSION_LESS ${ZLIB_FIND_VERSION}) - if(ZLIB_FIND_REQUIRED) - message(FATAL_ERROR "ZLIB version found (${ZLIB_VERSION_STRING}) is less then the minimum required (${ZLIB_FIND_VERSION}), aborting.") - else(ZLIB_FIND_REQUIRED) - message("ZLIB version found (${ZLIB_VERSION_STRING}) is less then the minimum required (${ZLIB_FIND_VERSION}), continue without ZLIB support.") - set(ZLIB_FOUND FALSE) - endif(ZLIB_FIND_REQUIRED) - endif() -endif(ZLIB_FIND_VERSION) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_INCLUDE_DIR ZLIB_LIBRARY + VERSION_VAR ZLIB_VERSION_STRING) IF(ZLIB_FOUND) SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) |