Mercurial > code
diff cmake/FindZIP.cmake @ 648:5bd9424a523a
misc: extreme cleanup
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 04 Oct 2018 21:17:55 +0200 |
parents | 01e01777ff50 |
children |
line wrap: on
line diff
--- a/cmake/FindZIP.cmake Wed Aug 01 14:08:40 2018 +0200 +++ b/cmake/FindZIP.cmake Thu Oct 04 21:17:55 2018 +0200 @@ -10,42 +10,42 @@ find_package(ZLIB QUIET) find_path( - ZIP_INCLUDE_DIR - NAMES zip.h + ZIP_INCLUDE_DIR + NAMES zip.h ) find_library( - ZIP_LIBRARY - NAMES zip libzip + ZIP_LIBRARY + NAMES zip libzip ) find_path( - ZIPCONF_INCLUDE_DIR - NAMES zipconf.h + ZIPCONF_INCLUDE_DIR + NAMES zipconf.h ) if (NOT ZIPCONF_INCLUDE_DIR) - # zipconf.h is sometimes directly in the include/ folder but on some systems - # like Windows, it is installed in the lib/ directory. - get_filename_component(_ZIP_PRIVATE_LIBRARY "${ZIP_LIBRARY}" DIRECTORY) + # zipconf.h is sometimes directly in the include/ folder but on some systems + # like Windows, it is installed in the lib/ directory. + get_filename_component(_ZIP_PRIVATE_LIBRARY "${ZIP_LIBRARY}" DIRECTORY) - find_path( - ZIPCONF_INCLUDE_DIR - NAMES zipconf.h - PATHS "${_ZIP_PRIVATE_LIBRARY}/libzip/include" - ) + find_path( + ZIPCONF_INCLUDE_DIR + NAMES zipconf.h + PATHS "${_ZIP_PRIVATE_LIBRARY}/libzip/include" + ) endif () include(FindPackageHandleStandardArgs) find_package_handle_standard_args( - ZIP - REQUIRED_VARS ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS ZIP_LIBRARY ZIP_INCLUDE_DIR ZIPCONF_INCLUDE_DIR + ZIP + REQUIRED_VARS ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS ZIP_LIBRARY ZIP_INCLUDE_DIR ZIPCONF_INCLUDE_DIR ) if (ZIP_FOUND) - set(ZIP_LIBRARIES ${ZIP_LIBRARY} ${ZLIB_LIBRARIES}) - set(ZIP_INCLUDE_DIRS ${ZIP_INCLUDE_DIR} ${ZIPCONF_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}) + set(ZIP_LIBRARIES ${ZIP_LIBRARY} ${ZLIB_LIBRARIES}) + set(ZIP_INCLUDE_DIRS ${ZIP_INCLUDE_DIR} ${ZIPCONF_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}) endif () mark_as_advanced(ZIP_LIBRARY ZIP_INCLUDE_DIR ZIPCONF_INCLUDE_DIR)