Browse Source

Merge pull request from tenacityteam/emabrey/vcpkg-update

Vcpkg update / Python 3 package update

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/650
pull/692/head
Emily Mabrey 5 months ago
committed by GitHub
parent
commit
5105641a83
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      CMakeLists.txt

8
CMakeLists.txt

@ -713,9 +713,13 @@ endif()
find_package( Python3 )
if( Python3_FOUND )
set( PYTHON "${Python3_EXECUTABLE}" )
elseif( DEFINED NUGET_EXECUTABLE AND EXISTS "${NUGET_EXECUTABLE}" )
message( STATUS "Finding vcpkg nuget python" )
execute_process( COMMAND "${NUGET_EXECUTABLE}" install python -Version 3.9.7 -OutputDirectory "${CMAKE_BINARY_DIR}/packages/" )
file( TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/packages/python.3.9.7/tools/python.exe" PYTHON )
elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
# This is an odd case now, as Conan requires Python as well
nuget_package( pkgdir "python3" "3.7.7" )
# This is defined in AudacityFunctions; maybe we can remove it by simply relying on vcpkg nuget?
nuget_package( pkgdir "python3" "3.9.7" )
file( TO_NATIVE_PATH "${pkgdir}/tools/python.exe" PYTHON )
endif()

Loading…
Cancel
Save