[shapelib] fix cmake export path (microsoft#21102)

Hoikas · Nov 5, 2021 · b31b625 · b31b625
1 parent 6202817
commit b31b625
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake
@@ -14,21 +14,22 @@ vcpkg_extract_source_archive_ex(
         option-build-test.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TEST=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_cmake_config_fixup(PACKAGE_NAME shp)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
 if(EXES)
-    file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/shapelib)
+    file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib")
     file(REMOVE ${EXES})
 endif()
 
@@ -38,12 +39,12 @@ if(DEBUG_EXES)
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-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)
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/shapelib)
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib")
 
 vcpkg_copy_pdbs()
diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "shapelib",
   "version-string": "1.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles",
-  "homepage": "https://download.osgeo.org/shapelib"
+  "homepage": "https://download.osgeo.org/shapelib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6186,7 +6186,7 @@
     },
     "shapelib": {
       "baseline": "1.5.0",
-      "port-version": 1
+      "port-version": 2
     },
     "shiva": {
       "baseline": "1.0",

diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c",
+      "version-string": "1.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "e32017b2f39e66b09726e3207e85486a820b9930",
       "version-string": "1.5.0",