[Cmake-commits] CMake branch, next, updated. v3.1.1-2429-g9d274b4

Brad King brad.king at kitware.com
Thu Jan 29 08:46:58 EST 2015


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  9d274b4f3ffba3ad339522375180d2bf568d016c (commit)
       via  3526daf5a2667d4bf8aee442d6e73f8b71ea6efc (commit)
      from  86945954ccf2d3649180c3bd6ea9faedb3a02ddf (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d274b4f3ffba3ad339522375180d2bf568d016c
commit 9d274b4f3ffba3ad339522375180d2bf568d016c
Merge: 8694595 3526daf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 29 08:46:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 29 08:46:57 2015 -0500

    Merge topic 'build-require-libarchive-3' into next
    
    3526daf5 Require libarchive 3.0.0 or later


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3526daf5a2667d4bf8aee442d6e73f8b71ea6efc
commit 3526daf5a2667d4bf8aee442d6e73f8b71ea6efc
Author:     Gregor Jasny <Gregor.Jasny at citrix.com>
AuthorDate: Wed Jan 28 22:31:37 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 29 08:46:01 2015 -0500

    Require libarchive 3.0.0 or later
    
    Older versions do not provide archive_entry_copy_sourcepath_w.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ad1be8..e61621d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,7 +336,7 @@ macro (CMAKE_BUILD_UTILITIES)
   #---------------------------------------------------------------------
   # Build or use system libarchive for CMake and CTest.
   if(CMAKE_USE_SYSTEM_LIBARCHIVE)
-    find_package(LibArchive)
+    find_package(LibArchive 3.0.0)
     if(NOT LibArchive_FOUND)
       message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!")
     endif()

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

Summary of changes:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list