diff options
| author | Rodrigo Hernandez Cordoba <kwizatz@aeongames.com> | 2019-06-06 12:54:15 -0600 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-06 11:54:15 -0700 |
| commit | db9e1af47b5b8a68b4502ce6871bf134cbcabcf2 (patch) | |
| tree | c84a2bf6dc12c2ec85f07c46ef7551da5d2defaa /ports/libcroco | |
| parent | 4c613a085ce819200b9d2f4da85da530ef08201c (diff) | |
| download | vcpkg-db9e1af47b5b8a68b4502ce6871bf134cbcabcf2.tar.gz vcpkg-db9e1af47b5b8a68b4502ce6871bf134cbcabcf2.zip | |
[gdk-pixbuf] Fix Linux compilation. (#6663)
* [gdk-pixbuf] Fix Linux compilation.
Unlike #6625 this version contains the minimal changes required
to keep other dependencies as untouched as possible.
* [gdk-pixbuf] Bumping CONTROL versions
* [libcroco] Added copy pdbs to portfile.
* [libcroco] Fix missing unoficial-libcroco-targets-debug.cmake...
... file from installation.
Diffstat (limited to 'ports/libcroco')
| -rw-r--r-- | ports/libcroco/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | ports/libcroco/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libcroco/portfile.cmake | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt index cb29f04cb..ff11792ff 100644 --- a/ports/libcroco/CMakeLists.txt +++ b/ports/libcroco/CMakeLists.txt @@ -1,11 +1,12 @@ cmake_minimum_required(VERSION 3.11) project(libcroco C) +find_package(unofficial-iconv REQUIRED) +find_package(unofficial-gettext CONFIG REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(LibXml2 REQUIRED) if(NOT WIN32) find_package(Threads REQUIRED) - find_package(unofficial-iconv REQUIRED) endif() find_path(GLIB_INCLUDE_DIR glib.h) @@ -67,10 +68,10 @@ file(GLOB SOURCES set(CMAKE_DEBUG_POSTFIX "d") -add_library(libcroco ${SOURCES}) +add_library(croco-0.6 ${SOURCES}) -target_include_directories(libcroco PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) -target_link_libraries(libcroco PRIVATE +target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +target_link_libraries(croco-0.6 PRIVATE unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule @@ -78,7 +79,7 @@ target_link_libraries(libcroco PRIVATE ${LIBXML2_LIBRARIES} ) -install(TARGETS libcroco +install(TARGETS croco-0.6 EXPORT libcroco-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -126,11 +127,12 @@ install( file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " include(CMakeFindDependencyMacro) +find_dependency(unofficial-gettext) +find_dependency(unofficial-iconv CONFIG) find_dependency(unofficial-glib CONFIG) find_dependency(LibXml2) if(NOT WIN32) find_dependency(Threads) - find_dependency(unofficial-iconv) endif() include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake) ") diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL index a0d05daaf..8badbeccc 100644 --- a/ports/libcroco/CONTROL +++ b/ports/libcroco/CONTROL @@ -1,4 +1,4 @@ Source: libcroco
-Version: 0.6.13
+Version: 0.6.13-1
Description: A standalone css2 parsing and manipulation library
Build-Depends: glib, libxml2
diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index e8da1e612..b5c332306 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -24,11 +24,13 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libcroco TARGET_PATH share/unofficial-libcroco)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright)
+vcpkg_copy_pdbs()
+
# Post-build test for cmake libraries
- vcpkg_test_cmake(PACKAGE_NAME libcroco)
+vcpkg_test_cmake(PACKAGE_NAME libcroco)
|