[Cmake-commits] CMake branch, next, updated. v3.5.2-876-gb7fa61c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b7fa61ce446cd8c7ae20722761c9055698e2b812 (commit)
       via  38d18bab54cd9dceba5902dcb4407ecdb585953c (commit)
      from  f31490f47121e48836ed3c9aa24c4c4e1d6f7615 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7fa61ce446cd8c7ae20722761c9055698e2b812
commit b7fa61ce446cd8c7ae20722761c9055698e2b812
Merge: f31490f 38d18ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 3 13:23:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 3 13:23:51 2016 -0400

    Merge topic 'FindLibArchive-3.2' into next
    
    38d18bab FindLibArchive: Support libarchive 3.2 version string format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d18bab54cd9dceba5902dcb4407ecdb585953c
commit 38d18bab54cd9dceba5902dcb4407ecdb585953c
Author:     Orion Poplawski <orion at cora.nwra.com>
AuthorDate: Fri Jun 3 09:37:03 2016 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 3 13:18:03 2016 -0400

    FindLibArchive: Support libarchive 3.2 version string format

diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake
index 471a4f1..dd93041 100644
--- a/Modules/FindLibArchive.cmake
+++ b/Modules/FindLibArchive.cmake
@@ -42,14 +42,15 @@ mark_as_advanced(LibArchive_INCLUDE_DIR LibArchive_LIBRARY)
 
 # Extract the version number from the header.
 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_VERSION_STRING "libarchive 2.8.4"
-  # Match either format.
-  set(_LibArchive_VERSION_REGEX "^#define[ \t]+ARCHIVE[_A-Z]+VERSION[_A-Z]*[ \t]+\"libarchive +([0-9]+)\\.([0-9]+)\\.([0-9]+)[^\"]*\".*$")
+  #  #define ARCHIVE_VERSION_ONLY_STRING "3.2.0"
+  # 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}")
   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()
   unset(_LibArchive_VERSION_REGEX)
   unset(_LibArchive_VERSION_STRING)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindLibArchive.cmake |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake