3rdparty/ext_quazip/liblocation.diff

0001 diff --git a/CMakeLists.txt b/CMakeLists.txt
0002 index ed96b33..af4e523 100644
0003 --- a/CMakeLists.txt
0004 +++ b/CMakeLists.txt
0005 @@ -1,6 +1,8 @@
0006  cmake_minimum_required(VERSION 2.6)
0007  project(QuaZip)
0008
0009 +include(GNUInstallDirs)
0010 +
0011  # CMP0042: Explicitly acknowledge MACOSX_RPATH
0012  # (introduced in CMake 2.8.12, enabled by default in CMake 3.0,
0013  # and producing a warning when unset since 3.7.1)
0014 @@ -45,12 +47,8 @@ endif()
0015  # Use system zlib on unix and Qt ZLIB on Windows
0016  find_package(ZLIB REQUIRED)
0017
0018 -# All build libraries are moved to this directory
0019 -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
0020 -
0021  set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
0022 -set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
0023 -set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE)
0024 +set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE STRING "Installation directory for pkgconfig (.pc) files" FORCE)
0025  set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE
0026      INTERNAL "Target name of libquazip" FORCE)
0027
0028 @@ -62,4 +60,4 @@ if(UNIX AND NOT APPLE)
0029         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/quazip.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}")
0030  endif()
0031
0032 -install(FILES QuaZipConfig.cmake DESTINATION ${LIB_DESTINATION}/cmake/QuaZip${QUAZIP_LIB_VERSION_SUFFIX} RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
0033 +install(FILES QuaZipConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake RENAME QuaZip${QUAZIP_LIB_VERSION_SUFFIX}Config.cmake)
0034 diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
0035 index 1efb5e2..f39d508 100644
0036 --- a/quazip/CMakeLists.txt
0037 +++ b/quazip/CMakeLists.txt
0038 @@ -27,5 +27,5 @@ set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION
0039  target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
0040  target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
0041
0042 -install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
0043 -install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
0044 +install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX})
0045 +install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static)