[python3] Build interpreter (#14891)

3 files changed, 12 insertions, 9 deletions

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 03b011fef..21d28b38c 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1204,9 +1204,6 @@ python2:arm-uwp=fail
 python2:x64-linux=fail
 python2:x64-osx=fail
 python2:x64-uwp=fail
-python3:arm64-windows=fail
-python3:arm-uwp=fail
-python3:x64-uwp=fail
 qhull:x64-uwp=fail
 qhull:arm-uwp=fail
 qpid-proton:arm-uwp=fail
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake
index 654fb8799..451bd6aa1 100644
--- a/scripts/cmake/vcpkg_build_make.cmake
+++ b/scripts/cmake/vcpkg_build_make.cmake
@@ -26,8 +26,10 @@ IF the port supports the install target use vcpkg_install_make() instead of vcpk
 Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()`

 

 ### BUILD_TARGET

-The target passed to the make build command (`./make <target>`). If not specified, the 'all' target will

-be passed.

+The target passed to the make build command (`./make <target>`). Defaults to 'all'.

+

+### INSTALL_TARGET

+The target passed to the make build command (`./make <target>`) if `ENABLE_INSTALL` is used. Defaults to 'install'.

 

 ### DISABLE_PARALLEL

 The underlying buildsystem will be instructed to not parallelize

@@ -56,7 +58,7 @@ function(vcpkg_build_make)
     include("${_VCPKG_CMAKE_VARS_FILE}")

 

     # parse parameters such that semicolons in options arguments to COMMAND don't get erased

-    cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE" "")

+    cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" "")

 

     if(NOT _bc_LOGFILE_ROOT)

         set(_bc_LOGFILE_ROOT "build")

@@ -70,6 +72,10 @@ function(vcpkg_build_make)
         set(_bc_MAKEFILE Makefile)

     endif()

 

+    if(NOT _bc_INSTALL_TARGET)

+        set(_bc_INSTALL_TARGET "install")

+    endif()

+

     if(WIN32)

         set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR})

         set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR})

@@ -93,7 +99,7 @@ function(vcpkg_build_make)
         string(REPLACE " " "\\\ " _VCPKG_PACKAGE_PREFIX ${CURRENT_PACKAGES_DIR})

         # Don't know why '/cygdrive' is suddenly a requirement here. (at least for x264)

         string(REGEX REPLACE "([a-zA-Z]):/" "/cygdrive/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}")

-        set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} install DESTDIR=${_VCPKG_PACKAGE_PREFIX})

+        set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX})

         #TODO: optimize for install-data (release) and install-exec (release/debug)

     else()

         # Compiler requriements

@@ -106,7 +112,7 @@ function(vcpkg_build_make)
         # Set make command and install command

         set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})

         set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET})

-        set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} install DESTDIR=${CURRENT_PACKAGES_DIR})

+        set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR})

     endif()

 

     # Since includes are buildtype independent those are setup by vcpkg_configure_make

diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
index ba0f31920..73a9cc4e6 100644
--- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
+++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
@@ -26,7 +26,7 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR)
             message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.")
         endif()
         macro(search_for_dependencies PATH_TO_SEARCH)
-            file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll")
+            file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll" "${TOOL_DIR}/*.pyd")
             foreach(TOOL IN LISTS TOOLS)
                 vcpkg_execute_required_process(
                     COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo