microsoft · BillyONeal · May 25, 2023 · May 25, 2023 · May 23, 2023 · May 25, 2023
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
@@ -67,7 +67,7 @@ vcpkg_download_distfile(GNI_TO_CMAKE_PY
 )
 
 # Generate CMake files from GN / GNI files
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 set(_root_gni_files_to_convert
   "compiler.gni Compiler.cmake"

diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 2,
+  "port-version": 3,
   "description": [
     "A conformant OpenGL ES implementation for Windows, Mac and Linux.",
     "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
@@ -31,6 +31,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake
@@ -13,7 +13,7 @@ vcpkg_from_github(
         fix-build-imgui.patch
 )
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 

diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-kinect-sensor-sdk",
   "version": "1.4.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
   "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
   "supports": "linux | windows",
@@ -29,6 +29,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ],
   "features": {

diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
@@ -20,7 +20,7 @@ if(VCPKG_TARGET_IS_MINGW)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")

diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "botan",
   "version": "2.19.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "license": "BSD-2-Clause",
@@ -10,6 +10,10 @@
     {
       "name": "vcpkg-cmake-get-vars",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ],
   "features": {

diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake
@@ -14,7 +14,7 @@ vcpkg_from_github(
 # conflicting with the built-in, more modern FindOpenCL.cmake
 file(REMOVE "${SOURCE_PATH}/src/FindOpenCL.cmake")
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/src"

diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clblas",
   "version": "2.12",
-  "port-version": 7,
+  "port-version": 8,
   "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.",
   "license": "Apache-2.0",
   "supports": "!(windows & arm)",
@@ -14,6 +14,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake
@@ -26,7 +26,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC)
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "coolprop",
   "version-semver": "6.4.3",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Thermophysical properties for the masses",
   "homepage": "https://github.com/CoolProp/CoolProp",
   "license": "MIT",
@@ -15,6 +15,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_git(
     REF 261679b3d2f3336d8531ed38e110254c3e2d1c10
 )
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"")
 
 function(checkout_in_path PATH URL REF)

diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "crashpad",
   "version-date": "2022-09-05",
-  "port-version": 4,
+  "port-version": 5,
   "description": [
     "Crashpad is a crash-reporting system.",
     "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."
@@ -22,6 +22,10 @@
       "name": "vcpkg-tool-gn",
       "host": true
     },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"

diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ctemplate",
   "version-date": "2020-09-14",
-  "port-version": 5,
+  "port-version": 6,
   "description": "C++ CTemplate system",
   "homepage": "https://github.com/OlafvdSpek/ctemplate",
   "supports": "windows & !arm",
@@ -13,6 +13,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/fbgemm/portfile.cmake b/ports/fbgemm/portfile.cmake
@@ -1,5 +1,5 @@
 # The project's CMakeLists.txt uses Python to select source files. Check if it is available in advance.
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH

diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fbgemm",
   "version": "0.4.1",
+  "port-version": 1,
   "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)",
   "homepage": "https://code.fb.com/ml-applications/fbgemm/",
   "license": "BSD-3-Clause",
@@ -15,6 +16,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ${FLINT_HASH}
 )
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_extract_source_archive(
     SOURCE_PATH

diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "flint",
   "version-semver": "2.8.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Fast Library for Number Theory",
   "homepage": "https://www.flintlib.org/",
   "supports": "!uwp",
@@ -16,6 +16,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 # Required to run build/generate_escape_tables.py et al.
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "folly",
   "version-string": "2023.05.15.00",
+  "port-version": 1,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",
@@ -32,6 +33,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ],
   "default-features": [

diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
@@ -12,7 +12,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL")
 file(COPY "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" DESTINATION "${SOURCE_PATH}/include/KHR")
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_execute_required_process(
   COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py"

diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gl3w",
   "version-date": "2018-05-31",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Simple OpenGL core profile loading",
   "homepage": "https://github.com/skaslev/gl3w",
   "dependencies": [
@@ -14,6 +14,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ]
 }
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake
@@ -111,7 +111,7 @@ endif()
 
 string(REPLACE ";" "," GLAD_API "${GLAD_API}")
 
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 file(COPY
     "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h"

diff --git a/ports/glad/vcpkg.json b/ports/glad/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glad",
   "version": "0.1.36",
+  "port-version": 1,
   "description": "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.",
   "homepage": "https://github.com/Dav1dde/glad",
   "documentation": "https://github.com/Dav1dde/glad/wiki",
@@ -15,6 +16,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-python3-interpreter",
+      "host": true
     }
   ],
   "default-features": [

diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
@@ -14,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 if (ENABLE_GLSLANG_BINARIES)
-    vcpkg_find_acquire_program(PYTHON3)
+    vcpkg_find_acquire_python3_interpreter(PYTHON3)
     get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
     vcpkg_add_to_path("${PYTHON_PATH}")
 endif ()

diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glslang",
   "version": "12.2.0",
+  "port-version": 1,
   "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",
@@ -17,7 +18,13 @@
   "features": {
     "tools": {
       "description": "Build the glslangValidator and spirv-remap binaries",
-      "supports": "!ios"
+      "supports": "!ios",
+      "dependencies": [
+        {
+          "name": "vcpkg-tool-python3-interpreter",
+          "host": true
+        }
+      ]
     }
   }
 }
diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake
@@ -43,7 +43,7 @@ endif()
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(GIT)
-vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_python3_interpreter(PYTHON3)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"