[Cmake-commits] CMake branch, next, updated. v2.8.7-2441-g560b231
Rolf Eike Beer
eike at sf-mail.de
Wed Feb 1 15:49:22 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 560b231807cb6fb36925fe6fd74e393c3b9fd1fd (commit)
via 9e25b127010464e7dea0f0f1989e5234ee4be536 (commit)
from 8a26060c14ee93f00da71a266c5e2c25bcccedf3 (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=560b231807cb6fb36925fe6fd74e393c3b9fd1fd
commit 560b231807cb6fb36925fe6fd74e393c3b9fd1fd
Merge: 8a26060 9e25b12
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 1 15:49:19 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 15:49:19 2012 -0500
Merge topic 'improve-libarchive' into next
9e25b12 FindLibArchive: support version selection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e25b127010464e7dea0f0f1989e5234ee4be536
commit 9e25b127010464e7dea0f0f1989e5234ee4be536
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 Feb 1 21:49:04 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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list