[world rebuild] Move vcpkg-cmake-get-vars to its own port

docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md

@@ -0,0 +1,16 @@
+# z_vcpkg_setup_pkgconfig_path
+
+The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/).
+
+`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`.
+The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`.
+
+```cmake
+z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>)
+# Build process that may transitively invoke pkgconfig
+z_vcpkg_restore_pkgconfig_path()
+```
+
+
+## Source
+[scripts/cmake/z\_vcpkg\_setup\_pkgconfig\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake)

docs/maintainers/portfile-functions.md

@@ -72,13 +72,16 @@
 
 - [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md)
 - [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md)
-- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake/vcpkg_cmake_get_vars.md)
 - [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)
 
 ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md)
 
 - [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md)
 
+### [vcpkg-cmake-get-vars](ports/vcpkg-cmake-get-vars.md)
+
+- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md)
+
 ### [vcpkg-pkgconfig-get-modules](ports/vcpkg-pkgconfig-get-modules.md)
 
 - [x\_vcpkg\_pkgconfig\_get\_modules](ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md)

docs/maintainers/ports/vcpkg-cmake-get-vars.md

@@ -0,0 +1,3 @@
+# vcpkg-cmake-get-vars
+
+This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts

docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md → docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md

@@ -1,6 +1,6 @@
 # vcpkg_cmake_get_vars
 
-The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md).
+The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md).
 
 Runs a cmake configure with a dummy project to extract certain cmake variables
 
@@ -38,4 +38,4 @@ message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}")
 ```
 
 ## Source
-[ports/vcpkg-cmake/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake)
+[ports/vcpkg-cmake-get-vars/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake)

docs/regenerate.ps1

@@ -28,6 +28,7 @@ class CMakeDocumentation {
 [String[]]$cmakeScriptsPorts = @(
     'vcpkg-cmake'
     'vcpkg-cmake-config'
+    'vcpkg-cmake-get-vars'
     'vcpkg-pkgconfig-get-modules'
 )
 

ports/boost-modular-build-helper/boost-modular-build.cmake

@@ -1,5 +1,6 @@
 include_guard(GLOBAL)
 include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
 
 get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
 get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY)

ports/boost-modular-build-helper/vcpkg.json

@@ -1,11 +1,18 @@
 {
   "name": "boost-modular-build-helper",
   "version": "1.79.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [
     "boost-uninstall",
-    "vcpkg-cmake"
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
   ]
 }

ports/ffmpeg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 12,
+  "port-version": 13,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -10,7 +10,7 @@
   "license": null,
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
+      "name": "vcpkg-cmake-get-vars",
       "host": true
     },
     {

ports/libgpiod/vcpkg.json

@@ -1,13 +1,14 @@
 {
   "name": "libgpiod",
   "version": "1.6.3",
+  "port-version": 1,
   "description": "C library and tools for interacting with the linux GPIO character device",
   "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git",
   "license": "LGPL-2.1-or-later",
   "supports": "linux & (x64 | arm64)",
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
+      "name": "vcpkg-cmake-get-vars",
       "host": true
     }
   ]

ports/vcpkg-cmake-get-vars/README.md

@@ -0,0 +1,3 @@
+# vcpkg-cmake-get-vars
+
+This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts

ports/vcpkg-cmake-get-vars/portfile.cmake

@@ -0,0 +1,14 @@
+if(VCPKG_CROSSCOMPILING)
+    # make FATAL_ERROR in CI when issue #16773 fixed
+    message(WARNING "vcpkg-cmake-get-vars is a host-only port; please mark it as a host port in your dependencies.")
+endif()
+
+file(INSTALL
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
+

ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake

@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake")

ports/vcpkg-cmake-get-vars/vcpkg.json

@@ -0,0 +1,11 @@
+{
+  "name": "vcpkg-cmake-get-vars",
+  "version-date": "2022-05-10",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

ports/vcpkg-cmake/portfile.cmake

@@ -1,4 +1,4 @@
-if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET)
+if(VCPKG_CROSSCOMPILING)
     # make FATAL_ERROR in CI when issue #16773 fixed
     message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.")
 endif()
@@ -7,10 +7,8 @@ file(INSTALL
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/copyright"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)

ports/vcpkg-cmake/vcpkg-port-config.cmake

@@ -1,4 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake")

ports/vcpkg-cmake/vcpkg.json

@@ -1,5 +1,5 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-05-06",
+  "version-date": "2022-05-10",
   "license": "MIT"
 }

ports/vcpkg-qmake/portfile.cmake

@@ -1,7 +1,7 @@
 file(INSTALL
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/copyright"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)

ports/vcpkg-qmake/vcpkg-port-config.cmake

@@ -1,4 +1,4 @@
 include_guard(GLOBAL)
-include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake")
 

ports/vcpkg-qmake/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-qmake",
-  "version-date": "2022-02-14",
+  "version-date": "2022-05-10",
   "license": "MIT",
   "supports": "native",
   "dependencies": [
@@ -9,6 +9,9 @@
       "name": "qtbase",
       "default-features": false
     },
-    "vcpkg-cmake"
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
   ]
 }

versions/b-/boost-modular-build-helper.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca",
+      "version": "1.79.0",
+      "port-version": 2
+    },
     {
       "git-tree": "dcb306fc661bfab322c75b55472e402387396099",
       "version": "1.79.0",

versions/baseline.json

@@ -826,7 +826,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.79.0",
-      "port-version": 1
+      "port-version": 2
     },
     "boost-move": {
       "baseline": "1.79.0",
@@ -2202,7 +2202,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 12
+      "port-version": 13
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
@@ -3606,7 +3606,7 @@
     },
     "libgpiod": {
       "baseline": "1.6.3",
-      "port-version": 0
+      "port-version": 1
     },
     "libgpod": {
       "baseline": "2019-08-29",
@@ -7321,13 +7321,17 @@
       "port-version": 1
     },
     "vcpkg-cmake": {
-      "baseline": "2022-05-06",
+      "baseline": "2022-05-10",
       "port-version": 0
     },
     "vcpkg-cmake-config": {
       "baseline": "2022-02-06",
       "port-version": 0
     },
+    "vcpkg-cmake-get-vars": {
+      "baseline": "2022-05-10",
+      "port-version": 0
+    },
     "vcpkg-get-python-packages": {
       "baseline": "2022-04-11",
       "port-version": 0
@@ -7345,7 +7349,7 @@
       "port-version": 0
     },
     "vcpkg-qmake": {
-      "baseline": "2022-02-14",
+      "baseline": "2022-05-10",
       "port-version": 0
     },
     "vcpkg-tool-gn": {

versions/f-/ffmpeg.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ad64f5ffe64b5fcd97e2e6d98273b70d498d6af0",
+      "version": "4.4.1",
+      "port-version": 13
+    },
     {
       "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b",
       "version": "4.4.1",

versions/l-/libgpiod.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "014bb3350492c4259151f00b3419e2054f707401",
+      "version": "1.6.3",
+      "port-version": 1
+    },
     {
       "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0",
       "version": "1.6.3",

versions/v-/vcpkg-cmake-get-vars.json

@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "181f509cdab757511233106aa44c529e04c0c29f",
+      "version-date": "2022-05-10",
+      "port-version": 0
+    }
+  ]
+}

versions/v-/vcpkg-cmake.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e8db2f70aa8b584aac932fcff65d91bf52d57731",
+      "version-date": "2022-05-10",
+      "port-version": 0
+    },
     {
       "git-tree": "46a5686341cf9136053ff01b9f213dbd2dbea8a6",
       "version-date": "2022-05-06",

versions/v-/vcpkg-qmake.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f5f5955d901ed2c7caac9e3681d23338d8fe845",
+      "version-date": "2022-05-10",
+      "port-version": 0
+    },
     {
       "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425",
       "version-date": "2022-02-14",