[libftdi1] no absolute paths (#21199)

microsoft · Nov 5, 2021 · 97b9c60 · 97b9c60
1 parent 8acb35e
commit 97b9c60
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/ports/libftdi1/portfile.cmake b/ports/libftdi1/portfile.cmake
@@ -14,11 +14,10 @@ vcpkg_extract_source_archive_ex(
         win32.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTS=OFF
         -DDOCUMENTATION=OFF
@@ -33,16 +32,16 @@ vcpkg_configure_cmake(
         -DFTDI_EEPROM=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libftdi1 TARGET_PATH share/libftdi1)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libftdi1)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libftdi1/vcpkg.json b/ports/libftdi1/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "libftdi1",
   "version": "1.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FTDI USB driver with bitbang mode",
   "dependencies": [
     "libconfuse",
-    "libusb"
+    "libusb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3434,7 +3434,7 @@
     },
     "libftdi1": {
       "baseline": "1.5",
-      "port-version": 1
+      "port-version": 2
     },
     "libgcrypt": {
       "baseline": "1.9.4",

diff --git a/versions/l-/libftdi1.json b/versions/l-/libftdi1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "412a93e6eef636e36b23774f3d132fe4df89d979",
+      "version": "1.5",
+      "port-version": 2
+    },
     {
       "git-tree": "5e6c7ec4555f72017a8e1982492aa8fc3cabcd83",
       "version": "1.5",