This commit is contained in:
Jia Yue Hua 2023-10-03 11:24:45 +08:00 коммит произвёл GitHub
Родитель 2372da54be
Коммит b04b4feab0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 9 добавлений и 59 удалений

Просмотреть файл

@ -1,52 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 597847b..da988ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,11 +258,6 @@ endif()
# To use these dependencies set PODOFO_DIR to the podofo BUILD directory in
# your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure
# the app that'll use podofo). See: find_package(...) in the cmake docs.
-if(PODOFO_BUILD_SHARED)
- export(TARGETS podofo_shared FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake")
-else()
- export(TARGETS podofo_static podofo_private FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake")
-endif()
# Enable packaging
set(CPACK_PACKAGE_DESCRIPTION "A C++ PDF manipulation library")
diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
index 3a148fb..4ca1420 100644
--- a/src/podofo/CMakeLists.txt
+++ b/src/podofo/CMakeLists.txt
@@ -77,11 +77,15 @@ if(PODOFO_BUILD_STATIC)
CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME "podofo"
)
- install(TARGETS podofo_static
+ install(TARGETS podofo_static podofo_private
+ EXPORT podofo-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ install(EXPORT podofo-config
+ DESTINATION share/podofo
+ )
set(PODOFO_LIBRARIES podofo_static podofo_private
CACHE INTERNAL "Which podofo library variant to depend on")
endif()
@@ -102,10 +106,14 @@ if(PODOFO_BUILD_SHARED)
# Since we're building a shared podofo, prefer to depend on this one for
# tests and tools over the static library (if built).
install(TARGETS podofo_shared
+ EXPORT podofo-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ install(EXPORT podofo-config
+ DESTINATION share/podofo
+ )
# Create a pkg-config file for linking against shared library
# if pkg-config is available on the system.

Просмотреть файл

@ -3,9 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO podofo/podofo
REF "${VERSION}"
SHA512 674024af031392253bc9ea02e392fa7b4a5c8894f3129e05f27133774ccf8b696e225789e886dedbe90bc2323c318b76e79857453a56d6014d7a5514e3f861a2
PATCHES
install-cmake-config.patch
SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

Просмотреть файл

@ -1,7 +1,6 @@
{
"name": "podofo",
"version": "0.10.0",
"port-version": 2,
"version": "0.10.1",
"description": "PoDoFo is a library to work with the PDF file format",
"homepage": "https://github.com/podofo/podofo",
"license": "LGPL-2.0-or-later",

Просмотреть файл

@ -6509,8 +6509,8 @@
"port-version": 4
},
"podofo": {
"baseline": "0.10.0",
"port-version": 2
"baseline": "0.10.1",
"port-version": 0
},
"poissonrecon": {
"baseline": "2021-09-26",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "75683a46d35cfff92866f9c559833c7d1962cc55",
"version": "0.10.1",
"port-version": 0
},
{
"git-tree": "2b550a1cf9eabeb17534710cb767f971c57184c1",
"version": "0.10.0",