diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-09-02 22:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:21:52 -0700 |
| commit | 9f73bc1a0e71b8883f20cae72a4e63ce347a3493 (patch) | |
| tree | 56793188593162588fe6e12874c2d505913509c8 /ports/gdal | |
| parent | bff0e8fc31e4e00a9c2f51b84c9b43bc46478729 (diff) | |
| download | vcpkg-9f73bc1a0e71b8883f20cae72a4e63ce347a3493.tar.gz vcpkg-9f73bc1a0e71b8883f20cae72a4e63ce347a3493.zip | |
Fix target_link_libraries on repeated inclusion of wrappers (#19120)
* Fix repeated inclusion of wrappers
* x-add-version
Diffstat (limited to 'ports/gdal')
| -rw-r--r-- | ports/gdal/vcpkg-cmake-wrapper.cmake | 2 | ||||
| -rw-r--r-- | ports/gdal/vcpkg.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index f6241e259..77e48eb4a 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -56,7 +56,7 @@ function(_gdal_add_dependency target package) endif()
if(dependency)
if(TARGET GDAL::GDAL) # CMake 3.14
- target_link_libraries(GDAL::GDAL INTERFACE ${dependency})
+ set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${dependency})
endif()
if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL")
set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE)
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 8ef4de49b..2bb7b63b1 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", |