[vcpkg-scripts] Use pkgconf in vcpkg pkgconfig get modules (#20527)

* use pkgconf * version stuff * Update ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * version stuff * fix obviuos error * bit of version playaround * version stuff Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
microsoft · Feb 1, 2022 · 84d9d9b · 84d9d9b
1 parent 864a477
commit 84d9d9b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
@@ -4,9 +4,10 @@ if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
 endif()
 
 file(COPY
-    "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/copyright"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
+configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY)
+
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
@@ -1,5 +1,11 @@
 {
   "name": "vcpkg-pkgconfig-get-modules",
-  "version-date": "2021-04-02",
-  "port-version": 1
+  "version-date": "2022-01-10",
+  "dependencies": [
+    {
+      "name": "pkgconf",
+      "host": true,
+      "default-features": false
+    }
+  ]
 }
diff --git a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
@@ -56,7 +56,8 @@ function(x_vcpkg_pkgconfig_get_modules)
         message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}")
     endif()
 
-    vcpkg_find_acquire_program(PKGCONFIG)
+    set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@")
+
     set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}")
 
     set(var_suffixes)

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7185,8 +7185,8 @@
       "port-version": 0
     },
     "vcpkg-pkgconfig-get-modules": {
-      "baseline": "2021-04-02",
-      "port-version": 1
+      "baseline": "2022-01-10",
+      "port-version": 0
     },
     "vcpkg-qmake": {
       "baseline": "2021-10-23",

diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1fae7b16a1eb390ca9239c3e82aa0fdb41f9565b",
+      "version-date": "2022-01-10",
+      "port-version": 0
+    },
     {
       "git-tree": "558512de1cc52fd9e246d6e7b99575418dd8500f",
       "version-date": "2021-04-02",