N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: Fix Qt download commands working directory. (#6579)

Browse source
This commit is contained in:
Steveice10 2023-05-31 15:42:13 -07:00 committed by GitHub
parent e33a8a9b26
commit 0f5ff64ae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeModules/DownloadExternals.cmake
View file

@ -65,6 +65,8 @@ function(download_qt_external target prefix_var)
endif() endif()
get_external_prefix(qt base_path) get_external_prefix(qt base_path)
file(MAKE_DIRECTORY "${base_path}")
if (target MATCHES "tools_.*") if (target MATCHES "tools_.*")
set(prefix "${base_path}") set(prefix "${base_path}")
set(install_args install-tool --outputdir ${base_path} ${host} desktop ${target}) set(install_args install-tool --outputdir ${base_path} ${host} desktop ${target})
@ -76,16 +78,21 @@ function(download_qt_external target prefix_var)
if (NOT EXISTS "${prefix}") if (NOT EXISTS "${prefix}")
message(STATUS "Downloading binaries for Qt...") message(STATUS "Downloading binaries for Qt...")
if (WIN32) if (WIN32)
set(aqt_path "${CMAKE_BINARY_DIR}/externals/aqt.exe") set(aqt_path "${base_path}/aqt.exe")
file(DOWNLOAD file(DOWNLOAD
https://github.com/miurahr/aqtinstall/releases/download/v3.1.4/aqt.exe https://github.com/miurahr/aqtinstall/releases/download/v3.1.4/aqt.exe
${aqt_path} SHOW_PROGRESS) ${aqt_path} SHOW_PROGRESS)
execute_process(COMMAND ${aqt_path} ${install_args}) execute_process(COMMAND ${aqt_path} ${install_args}
WORKING_DIRECTORY ${base_path})
else() else()
# aqt does not offer binary releases for other platforms, so download and run from pip. # aqt does not offer binary releases for other platforms, so download and run from pip.
set(aqt_install_path "${CMAKE_BINARY_DIR}/externals/aqt") set(aqt_install_path "${base_path}/aqt")
execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall) file(MAKE_DIRECTORY "${aqt_install_path}")
execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args})
execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall
WORKING_DIRECTORY ${base_path})
execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}
WORKING_DIRECTORY ${base_path})
endif() endif()
endif() endif()