diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL deleted file mode 100644 index 95e84e34aa..0000000000 --- a/ports/libharu/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: libharu -Version: 2017-08-15-9 -Homepage: https://github.com/libharu/libharu -Description: libharu - free PDF library -Build-Depends: zlib, libpng -Default-Features: notiffsymbols - -Feature: notiffsymbols -Description: disable symbols also defined by the tiff port -Build-Depends: tiff \ No newline at end of file diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 7a9f6891c0..20c5952547 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -31,34 +31,41 @@ else() set(VCPKG_BUILD_STATIC_LIBS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIBHPDF_STATIC=${VCPKG_BUILD_STATIC_LIBS} -DLIBHPDF_SHARED=${VCPKG_BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib ${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib") + endif() else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/lib/libhpdf.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.a") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a") + endif() endif() endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/README - ${CURRENT_PACKAGES_DIR}/debug/CHANGES - ${CURRENT_PACKAGES_DIR}/debug/INSTALL - ${CURRENT_PACKAGES_DIR}/README - ${CURRENT_PACKAGES_DIR}/CHANGES - ${CURRENT_PACKAGES_DIR}/INSTALL + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/README" + "${CURRENT_PACKAGES_DIR}/debug/CHANGES" + "${CURRENT_PACKAGES_DIR}/debug/INSTALL" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/CHANGES" + "${CURRENT_PACKAGES_DIR}/INSTALL" ) file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf.h" _contents) @@ -77,6 +84,5 @@ else() endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libharu RENAME copyright) - vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libharu/vcpkg.json b/ports/libharu/vcpkg.json new file mode 100644 index 0000000000..76537e89f5 --- /dev/null +++ b/ports/libharu/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libharu", + "version-string": "2017-08-15", + "port-version": 10, + "description": "libharu - free PDF library", + "homepage": "https://github.com/libharu/libharu", + "dependencies": [ + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ], + "default-features": [ + "notiffsymbols" + ], + "features": { + "notiffsymbols": { + "description": "disable symbols also defined by the tiff port", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 528f2b2d16..9df7bc0ece 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3305,8 +3305,8 @@ "port-version": 0 }, "libharu": { - "baseline": "2017-08-15-9", - "port-version": 0 + "baseline": "2017-08-15", + "port-version": 10 }, "libhdfs3": { "baseline": "2019-11-05", diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index 6b3132ff48..e08b48e1b6 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "312f4b697d2f46818c218e270bd447cdeb76322c", + "version-string": "2017-08-15", + "port-version": 10 + }, { "git-tree": "61662ee1cfa10c3e5244a43e24eb1f47e524c293", "version-string": "2017-08-15-9",