diff --git a/ports/libkml/add-target-include-directories.patch b/ports/libkml/add-target-include-directories.patch new file mode 100644 index 0000000000..9431a0c305 --- /dev/null +++ b/ports/libkml/add-target-include-directories.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/LibKMLHelper.cmake b/cmake/LibKMLHelper.cmake +index 5cc166a..3ed3079 100644 +--- a/cmake/LibKMLHelper.cmake ++++ b/cmake/LibKMLHelper.cmake +@@ -1,6 +1,7 @@ + macro(build_target) + cmake_parse_arguments(LIB "" "NAME" "SRCS;INCS;LINKS;DEPENDS" ${ARGN} ) + add_library(${LIB_NAME} ${LIB_SRCS}) ++ target_include_directories(${LIB_NAME} INTERFACE $) + + foreach(LIB_DEPEND ${LIB_DEPENDS}) + add_dependencies(${LIB_NAME} ${LIB_DEPEND}) diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index fa250cc25b..c501759901 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -5,13 +5,14 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libkml/libkml - REF 1.3.0 + REF "${VERSION}" SHA512 aa48158103d3af764bf98c1fb4cf3e1356b9cc6c8e79d80b96850916f0a8ccb1dac3a46427735dd0bf20647daa047d10e722ac3da2a214d4c1559bf6d5d7c853 HEAD_REF master PATCHES patch_empty_literal_on_vc.patch fix-mingw.patch fix-minizip.patch + add-target-include-directories.patch ) file(REMOVE @@ -39,4 +40,4 @@ else() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json index d20f72b6d6..e9301fcae4 100644 --- a/ports/libkml/vcpkg.json +++ b/ports/libkml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libkml", "version": "1.3.0", - "port-version": 10, + "port-version": 11, "description": "Reference implementation of OGC KML 2.2", "homepage": "https://github.com/libkml/libkml", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 77a9510c56..829ba5ca35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4038,7 +4038,7 @@ }, "libkml": { "baseline": "1.3.0", - "port-version": 10 + "port-version": 11 }, "liblas": { "baseline": "1.8.1", diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index 10beb6c801..8196268bb1 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4969a3e81df3ef13b5e3f2f94e652311df8bbafe", + "version": "1.3.0", + "port-version": 11 + }, { "git-tree": "8e1c949e666db286674cb1af98edb4d23d7ec843", "version": "1.3.0",