mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 20:23:02 +08:00
[podofo] Re-fix export PoDoFoConfig.cmake (#25447)
* [podofo] Re-fix export PoDoFoConfig.cmake * version * Fix path * version * Remove args in vcpkg_cmake_config_fixup * version
This commit is contained in:
parent
320059c010
commit
432037ce4f
@ -1,10 +1,49 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index df623ef..b2f2201 100644
|
index df623ef..8e653b8 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -576,3 +576,4 @@ IF(PODOFO_BUILD_STATIC)
|
@@ -569,10 +569,4 @@ CONFIGURE_FILE(${PoDoFo_SOURCE_DIR}/podofo_config.h.in ${PoDoFo_BINARY_DIR}/podo
|
||||||
EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
|
# 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 "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
|
||||||
|
-ENDIF(PODOFO_BUILD_SHARED)
|
||||||
|
-IF(PODOFO_BUILD_STATIC)
|
||||||
|
- EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
|
||||||
|
-ENDIF(PODOFO_BUILD_STATIC)
|
||||||
|
|
||||||
|
diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
|
||||||
|
index bba6b5f..16f0798 100644
|
||||||
|
--- a/src/podofo/CMakeLists.txt
|
||||||
|
+++ b/src/podofo/CMakeLists.txt
|
||||||
|
@@ -275,10 +275,14 @@ IF(PODOFO_BUILD_STATIC)
|
||||||
|
CACHE INTERNAL "Which PoDoFo library variant to depend on")
|
||||||
|
SET(USING_SHARED_PODOFO FALSE)
|
||||||
|
INSTALL(TARGETS podofo_static
|
||||||
|
+ EXPORT PoDoFoConfig
|
||||||
|
RUNTIME DESTINATION "bin"
|
||||||
|
LIBRARY DESTINATION "${LIBDIRNAME}"
|
||||||
|
ARCHIVE DESTINATION "${LIBDIRNAME}"
|
||||||
|
)
|
||||||
|
+ INSTALL(EXPORT PoDoFoConfig
|
||||||
|
+ DESTINATION share/podofo
|
||||||
|
+ )
|
||||||
ENDIF(PODOFO_BUILD_STATIC)
|
ENDIF(PODOFO_BUILD_STATIC)
|
||||||
|
|
||||||
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake" DESTINATION share/podofo)
|
IF(PODOFO_BUILD_SHARED)
|
||||||
\ No newline at end of file
|
@@ -301,10 +305,14 @@ IF(PODOFO_BUILD_SHARED)
|
||||||
|
CACHE INTERNAL "Which PoDoFo library variant to depend on")
|
||||||
|
SET(USING_SHARED_PODOFO TRUE)
|
||||||
|
INSTALL(TARGETS podofo_shared
|
||||||
|
+ EXPORT PoDoFoConfig
|
||||||
|
RUNTIME DESTINATION "bin"
|
||||||
|
LIBRARY DESTINATION "${LIBDIRNAME}"
|
||||||
|
ARCHIVE DESTINATION "${LIBDIRNAME}"
|
||||||
|
)
|
||||||
|
+ INSTALL(EXPORT PoDoFoConfig
|
||||||
|
+ DESTINATION share/podofo
|
||||||
|
+ )
|
||||||
|
|
||||||
|
|
||||||
|
# Create a pkg-config file for linking against shared library
|
||||||
|
@ -54,8 +54,8 @@ vcpkg_cmake_configure(
|
|||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
|
vcpkg_copy_pdbs()
|
||||||
|
|
||||||
vcpkg_cmake_config_fixup()
|
|
||||||
vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake"
|
vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake"
|
||||||
"# Create imported target podofo_shared"
|
"# Create imported target podofo_shared"
|
||||||
[[
|
[[
|
||||||
@ -65,6 +65,8 @@ find_dependency(OpenSSL)
|
|||||||
]]
|
]]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
vcpkg_cmake_config_fixup()
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
|
|
||||||
# Handle copyright
|
# Handle copyright
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "podofo",
|
"name": "podofo",
|
||||||
"version": "0.9.7",
|
"version": "0.9.7",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "PoDoFo is a library to work with the PDF file format",
|
"description": "PoDoFo is a library to work with the PDF file format",
|
||||||
"homepage": "https://sourceforge.net/projects/podofo/",
|
"homepage": "https://sourceforge.net/projects/podofo/",
|
||||||
"license": "LGPL-2.0-only",
|
"license": "LGPL-2.0-only",
|
||||||
|
@ -5542,7 +5542,7 @@
|
|||||||
},
|
},
|
||||||
"podofo": {
|
"podofo": {
|
||||||
"baseline": "0.9.7",
|
"baseline": "0.9.7",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"poissonrecon": {
|
"poissonrecon": {
|
||||||
"baseline": "2021-09-26",
|
"baseline": "2021-09-26",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f7f44c3594a2850412f1cb33ef1feaa78d35b7f9",
|
||||||
|
"version": "0.9.7",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "494b98ef9f42c9e4bafe58feff7d5738bb20f44e",
|
"git-tree": "494b98ef9f42c9e4bafe58feff7d5738bb20f44e",
|
||||||
"version": "0.9.7",
|
"version": "0.9.7",
|
||||||
|
Loading…
Reference in New Issue
Block a user