mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:09:00 +08:00
[vcpkg baseline][duckx] fix deps (#24264)
* fix duckx * format * port-version * version stuff * rename file * version update Co-authored-by: Alexander Neumann <you@example.com>
This commit is contained in:
parent
c37cc7836a
commit
ac6a9dcfce
66
ports/duckx/fix_dependencies.patch
Normal file
66
ports/duckx/fix_dependencies.patch
Normal file
@ -0,0 +1,66 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f45218659..1ec4250c0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -9,9 +9,11 @@ endif()
|
||||
option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
|
||||
option(BUILD_SAMPLE "Build provided sample" OFF)
|
||||
|
||||
-set(HEADERS src/duckx.hpp src/zip.h src/miniz.h
|
||||
- src/pugixml.hpp src/pugiconfig.hpp)
|
||||
-set(SOURCES src/duckx.cpp src/zip.c src/pugixml.cpp)
|
||||
+find_package(libzip REQUIRED)
|
||||
+find_package(pugixml REQUIRED)
|
||||
+
|
||||
+set(HEADERS src/duckx.hpp)
|
||||
+set(SOURCES src/duckx.cpp)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
add_library(duckx SHARED ${HEADERS} ${SOURCES})
|
||||
@@ -19,6 +21,8 @@ else()
|
||||
add_library(duckx STATIC ${HEADERS} ${SOURCES})
|
||||
endif()
|
||||
|
||||
+target_link_libraries(duckx PUBLIC libzip::zip pugixml::pugixml)
|
||||
+
|
||||
add_library(duckx::duckx ALIAS duckx)
|
||||
|
||||
target_include_directories(duckx PUBLIC
|
||||
@@ -38,12 +42,22 @@ endif()
|
||||
include(GNUInstallDirs)
|
||||
install(
|
||||
TARGETS duckx
|
||||
- EXPORT duckxConfig
|
||||
+ EXPORT duckxTargets
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
-install(EXPORT duckxConfig NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx)
|
||||
+install(EXPORT duckxTargets NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx)
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/duckxConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake"
|
||||
+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx"
|
||||
+ NO_SET_AND_CHECK_MACRO
|
||||
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
||||
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" COMPATIBILITY ExactVersion)
|
||||
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake"
|
||||
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx")
|
||||
+
|
||||
install(FILES ${HEADERS} DESTINATION include)
|
||||
|
||||
|
||||
diff --git a/duckxConfig.cmake.in b/duckxConfig.cmake.in
|
||||
new file mode 100644
|
||||
index 000000000..960b03b3b
|
||||
--- /dev/null
|
||||
+++ b/duckxConfig.cmake.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+@PACKAGE_INIT@
|
||||
+
|
||||
+include(CMakeFindDependencyMacro)
|
||||
+find_dependency(libzip)
|
||||
+find_dependency(pugixml)
|
||||
+include("${CMAKE_CURRENT_LIST_DIR}/duckxTargets.cmake")
|
||||
\ No newline at end of file
|
@ -7,6 +7,7 @@ vcpkg_from_github(
|
||||
REPO amiremohamadi/DuckX
|
||||
REF v1.2.2
|
||||
SHA512 3f1e626973b4638adaffcc0a20f59791f3a70abda1d2d09fddca9312014cef86d097f24873e74ef58c775b27c71a637e44f340da01a301b00ef334600bd412d6
|
||||
PATCHES fix_dependencies.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,10 +1,13 @@
|
||||
{
|
||||
"name": "duckx",
|
||||
"version": "1.2.2",
|
||||
"port-version": 1,
|
||||
"description": "DuckX is a library for creation of Office docx files.",
|
||||
"homepage": "https://github.com/amiremohamadi/DuckX",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
"libzip",
|
||||
"pugixml",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
|
@ -1958,7 +1958,7 @@
|
||||
},
|
||||
"duckx": {
|
||||
"baseline": "1.2.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"duilib": {
|
||||
"baseline": "2019-04-28",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bed3914236def15bab45f3969a169005a25d3f1d",
|
||||
"version": "1.2.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "6637b59789032a1ef84a1c6324bc7b672e346152",
|
||||
"version": "1.2.2",
|
||||
|
Loading…
Reference in New Issue
Block a user