From 66fc3e48c1daf67145aa3fbac1a3e28054a16233 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:31:17 +0100 Subject: [PATCH] [libspatialindex] modernize (#28401) --- ports/libspatialindex/portfile.cmake | 11 ++++++----- ports/libspatialindex/vcpkg.json | 7 ++++++- versions/baseline.json | 2 +- versions/l-/libspatialindex.json | 5 +++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake index 8c97489433..5ab8185d95 100644 --- a/ports/libspatialindex/portfile.cmake +++ b/ports/libspatialindex/portfile.cmake @@ -9,19 +9,20 @@ vcpkg_from_github( mingw.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DSIDX_BUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() #Debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libspatialindex/vcpkg.json b/ports/libspatialindex/vcpkg.json index 8b968ca9a5..d8180d7447 100644 --- a/ports/libspatialindex/vcpkg.json +++ b/ports/libspatialindex/vcpkg.json @@ -1,10 +1,15 @@ { "name": "libspatialindex", "version": "1.9.3", - "port-version": 1, + "port-version": 3, "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.", "homepage": "http://libspatialindex.github.com", + "license": "MIT", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index c98e40fec1..3c0b16afb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4246,7 +4246,7 @@ }, "libspatialindex": { "baseline": "1.9.3", - "port-version": 1 + "port-version": 3 }, "libspatialite": { "baseline": "5.0.1", diff --git a/versions/l-/libspatialindex.json b/versions/l-/libspatialindex.json index fc9887f64d..a981065ef2 100644 --- a/versions/l-/libspatialindex.json +++ b/versions/l-/libspatialindex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97b36055483a86131a19e83cde29ec1fbd0e87c3", + "version": "1.9.3", + "port-version": 3 + }, { "git-tree": "48179f2e21bb0918129f0f2d02cacb39f88ab347", "version": "1.9.3",