diff options
Diffstat (limited to 'modules/FindBZip2.cmake')
| -rw-r--r-- | modules/FindBZip2.cmake | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake index 0f05e0bf..9976c282 100644 --- a/modules/FindBZip2.cmake +++ b/modules/FindBZip2.cmake @@ -8,14 +8,12 @@ # BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_ -IF (DEFINED CACHED_BZIP2) +if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - # in cache already - IF ("${CACHED_BZIP2}" STREQUAL "YES") - SET(BZIP2_FOUND TRUE) - ENDIF ("${CACHED_BZIP2}" STREQUAL "YES") + # in cache already, avoid doing the CHECK_LIBRARY_EXISTS again. + SET(BZIP2_FOUND TRUE) -ELSE (DEFINED CACHED_BZIP2) +else (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h /usr/include @@ -32,9 +30,6 @@ ELSE (DEFINED CACHED_BZIP2) set(BZIP2_FOUND TRUE) INCLUDE(CheckLibraryExists) CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX) - set(CACHED_BZIP2 "YES") - else (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - set(CACHED_BZIP2 "NO") endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) if (BZIP2_FOUND) @@ -47,7 +42,6 @@ ELSE (DEFINED CACHED_BZIP2) endif (BZip2_FIND_REQUIRED) endif (BZIP2_FOUND) - set(CACHED_BZIP2 ${CACHED_BZIP2} CACHE INTERNAL "If bzip2 was checked") MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES) -ENDIF(DEFINED CACHED_BZIP2) +endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) |