[Cmake-commits] CMake branch, next, updated. v2.8.7-2255-gac6f039

Rolf Eike Beer eike at sf-mail.de
Wed Jan 25 11:42:36 EST 2012


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  ac6f039844ac8788d1385a3d46033bbac42dae37 (commit)
       via  1ed0c6611b82987d1caaa99071e0b55e572429f8 (commit)
      from  da1c1c3067df653dbc51fb6d12ae00aebe40ec72 (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=ac6f039844ac8788d1385a3d46033bbac42dae37
commit ac6f039844ac8788d1385a3d46033bbac42dae37
Merge: da1c1c3 1ed0c66
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 11:42:35 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 11:42:35 2012 -0500

    Merge topic 'improve-libarchive' into next
    
    1ed0c66 FindLibArchive: support version selection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ed0c6611b82987d1caaa99071e0b55e572429f8
commit 1ed0c6611b82987d1caaa99071e0b55e572429f8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 17:42:00 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 17:42:14 2012 +0100

    FindLibArchive: support version selection

diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake
index cedcd24..be931c5 100644
--- a/Modules/FindLibArchive.cmake
+++ b/Modules/FindLibArchive.cmake
@@ -54,8 +54,9 @@ endif()
 #  itself includes this FindLibArchive when built with an older CMake that does
 #  not provide it.  The older CMake also does not have CMAKE_CURRENT_LIST_DIR.)
 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(LibArchive DEFAULT_MSG
-  LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+find_package_handle_standard_args(LibArchive
+                                  REQUIRED_VARS LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+                                  VERSION_VAR LibArchive_VERSION
   )
 set(LibArchive_FOUND ${LIBARCHIVE_FOUND})
 unset(LIBARCHIVE_FOUND)

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

Summary of changes:
 Modules/FindLibArchive.cmake |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list