summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-02-07 20:34:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-02-07 20:34:20 (GMT)
commit38e6757cd3192b4c6048409feada7a8c397504cf (patch)
treeeb2b716bd3080325284022c9e82610b9c8321bb7
parentaab8510c256e6c1174218317c30541ea3594cf97 (diff)
parent9e25b127010464e7dea0f0f1989e5234ee4be536 (diff)
downloadCMake-38e6757cd3192b4c6048409feada7a8c397504cf.zip
CMake-38e6757cd3192b4c6048409feada7a8c397504cf.tar.gz
CMake-38e6757cd3192b4c6048409feada7a8c397504cf.tar.bz2
Merge topic 'improve-libarchive'
9e25b12 FindLibArchive: support version selection
-rw-r--r--Modules/FindLibArchive.cmake5
1 files changed, 3 insertions, 2 deletions
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)