diff options
| author | Andres Mejia <amejia004@gmail.com> | 2013-01-31 19:50:42 -0500 |
|---|---|---|
| committer | Andres Mejia <amejia004@gmail.com> | 2013-01-31 19:50:42 -0500 |
| commit | afd7f05750ae5c8987130a75b0edd3f03fbe1e81 (patch) | |
| tree | a952ff338502be6f8ecb755e19ac48aaae6d7d98 | |
| parent | 146a5067ca976b208b4aab06127efdf4ba9096f9 (diff) | |
| download | libarchive-afd7f05750ae5c8987130a75b0edd3f03fbe1e81.tar.gz | |
Rename PCREPOSIX_INCLUDE* to PCRE_INCLUDE* as pcreposix.h will be found alongside pcre.h.
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ad6504e..cacad62b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -890,12 +890,12 @@ IF(ENABLE_PCREPOSIX) # # If requested, try finding library for PCREPOSIX # - IF (PCREPOSIX_INCLUDE_DIRS) + IF (PCRE_INCLUDE_DIRS) # Already in cache, be silent SET(PCREPOSIX_FIND_QUIETLY TRUE) - ENDIF (PCREPOSIX_INCLUDE_DIRS) + ENDIF (PCRE_INCLUDE_DIRS) - FIND_PATH(PCREPOSIX_INCLUDE_DIR pcreposix.h) + FIND_PATH(PCRE_INCLUDE_DIR pcreposix.h) SET(PCREPOSIX_NAMES pcreposix) FIND_LIBRARY(PCREPOSIX_LIBRARY NAMES ${PCREPOSIX_NAMES} ) @@ -903,25 +903,25 @@ IF(ENABLE_PCREPOSIX) # handle the QUIETLY and REQUIRED arguments and set PCREPOSIX_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCREPOSIX DEFAULT_MSG PCREPOSIX_LIBRARY PCREPOSIX_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCREPOSIX DEFAULT_MSG PCREPOSIX_LIBRARY PCRE_INCLUDE_DIR) IF(PCREPOSIX_FOUND) SET( PCREPOSIX_LIBRARIES ${PCREPOSIX_LIBRARY} ) - SET( PCREPOSIX_INCLUDE_DIRS ${PCREPOSIX_INCLUDE_DIR} ) + SET( PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR} ) IF(PCREPOSIX_LIBRARY) SET(CMAKE_REQUIRED_LIBRARIES ${PCREPOSIX_LIBRARY}) ENDIF(PCREPOSIX_LIBRARY) - IF(PCREPOSIX_INCLUDE_DIR) - INCLUDE_DIRECTORIES(${PCREPOSIX_INCLUDE_DIR}) - SET(CMAKE_REQUIRED_INCLUDES ${PCREPOSIX_INCLUDE_DIR}) - ENDIF(PCREPOSIX_INCLUDE_DIR) + IF(PCRE_INCLUDE_DIR) + INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_INCLUDES ${PCRE_INCLUDE_DIR}) + ENDIF(PCRE_INCLUDE_DIR) LA_CHECK_INCLUDE_FILE("pcreposix.h" HAVE_PCREPOSIX_H) # Test if a macro is needed for the library. TRY_MACRO_FOR_LIBRARY( - "${PCREPOSIX_INCLUDE_DIR}" "${PCREPOSIX_LIBRARY}" + "${PCRE_INCLUDE_DIR}" "${PCREPOSIX_LIBRARY}" COMPILES "#include <stddef.h>\n#include <pcreposix.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}" "PCRE_STATIC") @@ -931,10 +931,10 @@ IF(ENABLE_PCREPOSIX) ENDIF(PCRE_STATIC) ELSE(PCREPOSIX_FOUND) SET( PCREPOSIX_LIBRARIES ) - SET( PCREPOSIX_INCLUDE_DIRS ) + SET( PCRE_INCLUDE_DIRS ) ENDIF(PCREPOSIX_FOUND) - MARK_AS_ADVANCED( PCREPOSIX_LIBRARIES PCREPOSIX_INCLUDE_DIRS ) + MARK_AS_ADVANCED( PCREPOSIX_LIBRARIES PCRE_INCLUDE_DIRS ) ENDIF(ENABLE_PCREPOSIX) IF(NOT PCREPOSIX_FOUND) |