mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[quazip] update to 1.1 (#20611)
* [quazip] update to 1.1 * update version * change version-string to version * update version
This commit is contained in:
parent
20a4c683b3
commit
728c0d4ccb
@ -1,20 +1,17 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO stachenov/quazip
|
||||
REF v0.9.1
|
||||
SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
|
||||
PATCHES
|
||||
vcpkg_remove_extra_static.patch
|
||||
REF v1.1
|
||||
SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/QuaZip5/)
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.1)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright)
|
@ -1,11 +1,18 @@
|
||||
{
|
||||
"name": "quazip",
|
||||
"version-string": "0.9.1",
|
||||
"port-version": 1,
|
||||
"version": "1.1",
|
||||
"description": "Qt/C++ wrapper over minizip",
|
||||
"homepage": "https://stachenov.github.io/quazip/",
|
||||
"dependencies": [
|
||||
"qt5-base",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
|
@ -1,30 +0,0 @@
|
||||
diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
|
||||
index 1efb5e2..2412b8a 100644
|
||||
--- a/quazip/CMakeLists.txt
|
||||
+++ b/quazip/CMakeLists.txt
|
||||
@@ -10,22 +10,13 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD)
|
||||
qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
|
||||
set(SRCS ${SRCS} ${MOC_SRCS})
|
||||
|
||||
-add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
|
||||
-add_library(quazip_static STATIC ${SRCS})
|
||||
-
|
||||
-# Windows uses .lib extension for both static and shared library
|
||||
-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
|
||||
-if (NOT WIN32)
|
||||
- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
|
||||
-endif ()
|
||||
+add_library(${QUAZIP_LIB_TARGET_NAME} ${SRCS})
|
||||
|
||||
target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
|
||||
-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
|
||||
-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
|
||||
+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
|
||||
|
||||
# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
|
||||
target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
|
||||
install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
|
||||
-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
|
||||
+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
@ -5705,8 +5705,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"quazip": {
|
||||
"baseline": "0.9.1",
|
||||
"port-version": 1
|
||||
"baseline": "1.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"quickfast": {
|
||||
"baseline": "1.5",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2fcb780cdf45dcb2a99c42837d9be27f5d07615e",
|
||||
"version": "1.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "eb05336d7d482b98ab3e83dbbc58116707f547d6",
|
||||
"version-string": "0.9.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user