Merge topic 'FindLibArchive-3.2'
38d18bab
FindLibArchive: Support libarchive 3.2 version string format
This commit is contained in:
commit
ab7d649fae
|
@ -42,14 +42,15 @@ mark_as_advanced(LibArchive_INCLUDE_DIR LibArchive_LIBRARY)
|
||||||
|
|
||||||
# Extract the version number from the header.
|
# Extract the version number from the header.
|
||||||
if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h")
|
if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h")
|
||||||
# The version string appears in one of two known formats in the header:
|
# The version string appears in one of three known formats in the header:
|
||||||
# #define ARCHIVE_LIBRARY_VERSION "libarchive 2.4.12"
|
# #define ARCHIVE_LIBRARY_VERSION "libarchive 2.4.12"
|
||||||
# #define ARCHIVE_VERSION_STRING "libarchive 2.8.4"
|
# #define ARCHIVE_VERSION_STRING "libarchive 2.8.4"
|
||||||
# Match either format.
|
# #define ARCHIVE_VERSION_ONLY_STRING "3.2.0"
|
||||||
set(_LibArchive_VERSION_REGEX "^#define[ \t]+ARCHIVE[_A-Z]+VERSION[_A-Z]*[ \t]+\"libarchive +([0-9]+)\\.([0-9]+)\\.([0-9]+)[^\"]*\".*$")
|
# Match any format.
|
||||||
|
set(_LibArchive_VERSION_REGEX "^#define[ \t]+ARCHIVE[_A-Z]+VERSION[_A-Z]*[ \t]+\"(libarchive +)?([0-9]+)\\.([0-9]+)\\.([0-9]+)[^\"]*\".*$")
|
||||||
file(STRINGS "${LibArchive_INCLUDE_DIR}/archive.h" _LibArchive_VERSION_STRING LIMIT_COUNT 1 REGEX "${_LibArchive_VERSION_REGEX}")
|
file(STRINGS "${LibArchive_INCLUDE_DIR}/archive.h" _LibArchive_VERSION_STRING LIMIT_COUNT 1 REGEX "${_LibArchive_VERSION_REGEX}")
|
||||||
if(_LibArchive_VERSION_STRING)
|
if(_LibArchive_VERSION_STRING)
|
||||||
string(REGEX REPLACE "${_LibArchive_VERSION_REGEX}" "\\1.\\2.\\3" LibArchive_VERSION "${_LibArchive_VERSION_STRING}")
|
string(REGEX REPLACE "${_LibArchive_VERSION_REGEX}" "\\2.\\3.\\4" LibArchive_VERSION "${_LibArchive_VERSION_STRING}")
|
||||||
endif()
|
endif()
|
||||||
unset(_LibArchive_VERSION_REGEX)
|
unset(_LibArchive_VERSION_REGEX)
|
||||||
unset(_LibArchive_VERSION_STRING)
|
unset(_LibArchive_VERSION_STRING)
|
||||||
|
|
Loading…
Reference in New Issue