mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
d4422c3beb
* Major update to port poppler * Fixup usage requirements via main pc file * Add usage based on FindPkgConfig * Export unofficial cmake config * uwp is unsupported * [gdal] Add poppler feature * [gdal] Update poppler dependency * [gdal] Add patch for poppler C++17 API * Disable ENABLE_RELOCATABLE * Update to 22.02.0 from poppler gitlab * Update versions * [skip actions] CI with gdal tools * Revert "[skip actions] CI with gdal tools" * Modify feature name for private API * Update versions * Add license field to gdal manifest * Add port name to unofficial namespace * Rectify poppler version number * Update versions * poppler[fontconfig] doesn't build for MSVC * Update versions Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9a0dcb1..c1f2f02 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -600,7 +600,14 @@ target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
|
|
if(CMAKE_USE_PTHREADS_INIT)
|
|
target_link_libraries(poppler LINK_PRIVATE Threads::Threads)
|
|
endif()
|
|
-install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+target_include_directories(poppler PUBLIC
|
|
+ $<INSTALL_INTERFACE:include/poppler>
|
|
+ $<INSTALL_INTERFACE:include/poppler/fofi>
|
|
+ $<INSTALL_INTERFACE:include/poppler/goo>
|
|
+)
|
|
+set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private)
|
|
+install(TARGETS poppler EXPORT unofficial-poppler-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(EXPORT unofficial-poppler-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler)
|
|
|
|
if(ENABLE_UNSTABLE_API_ABI_HEADERS)
|
|
install(FILES
|
|
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
|
index c37936b..344933c 100644
|
|
--- a/cpp/CMakeLists.txt
|
|
+++ b/cpp/CMakeLists.txt
|
|
@@ -32,7 +32,8 @@ if(MINGW AND BUILD_SHARED_LIBS)
|
|
set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
|
endif()
|
|
target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES})
|
|
-install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(TARGETS poppler-cpp EXPORT unofficial-poppler-cpp-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(EXPORT unofficial-poppler-cpp-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler)
|
|
|
|
install(FILES
|
|
poppler-destination.h
|