diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-29 13:59:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-29 13:59:20 (GMT) |
| commit | 325e452ea2d9b3224ade47eda24e44bf00a8306d (patch) | |
| tree | ed39df1886167e62b3f58473702d3b7a6df1417e /Modules/FindLibArchive.cmake | |
| parent | 9e8f74fbb0148f6aa0a026b8610da6d84bbf0366 (diff) | |
| parent | 745b56f58c8147aa6015a918f3bfd19abc807b48 (diff) | |
| download | CMake-325e452ea2d9b3224ade47eda24e44bf00a8306d.zip CMake-325e452ea2d9b3224ade47eda24e44bf00a8306d.tar.gz CMake-325e452ea2d9b3224ade47eda24e44bf00a8306d.tar.bz2 | |
Merge topic 'find-module-cleanup-sweep'
745b56f5 Find*.cmake: drop the comments before including FPHSA
0ab9cb46 FindLibArchive: do not set LibArchive_FOUND explicitly
703d1943 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
Diffstat (limited to 'Modules/FindLibArchive.cmake')
| -rw-r--r-- | Modules/FindLibArchive.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake index 1a26bbb..38e512f 100644 --- a/Modules/FindLibArchive.cmake +++ b/Modules/FindLibArchive.cmake @@ -46,17 +46,11 @@ if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h") unset(_LibArchive_VERSION_STRING) endif() -# Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND -# to TRUE if all listed variables are TRUE. -# (Use ${CMAKE_ROOT}/Modules instead of ${CMAKE_CURRENT_LIST_DIR} because CMake -# 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) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) 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) if(LibArchive_FOUND) |