build: Remove need for system Python to download Qt on macOS. (#7125)
This commit is contained in:
parent
1f6393e7d5
commit
5193a5d222
|
@ -1,10 +1,5 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
# TODO: Work around pip install issues with Python 3.12 in the GitHub runner image.
|
||||
# See: https://github.com/actions/runner-images/issues/8709
|
||||
PYTHON_PATH=$(brew --prefix python@3.11)
|
||||
export PATH=$PYTHON_PATH/bin:$PYTHON_PATH/libexec/bin:$PATH
|
||||
|
||||
mkdir build && cd build
|
||||
cmake .. -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
# TODO: Work around pip install issues with Python 3.12 in the GitHub runner image.
|
||||
# See: https://github.com/actions/runner-images/issues/8709
|
||||
PYTHON_PATH=$(brew --prefix python@3.11)
|
||||
export PATH=$PYTHON_PATH/bin:$PYTHON_PATH/libexec/bin:$PATH
|
||||
|
||||
mkdir build && cd build
|
||||
cmake .. -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
|
|
@ -67,13 +67,22 @@ function(download_qt target)
|
|||
|
||||
if (NOT EXISTS "${prefix}")
|
||||
message(STATUS "Downloading binaries for Qt...")
|
||||
set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.1.9")
|
||||
if (WIN32)
|
||||
set(aqt_path "${base_path}/aqt.exe")
|
||||
file(DOWNLOAD
|
||||
https://github.com/miurahr/aqtinstall/releases/download/v3.1.7/aqt.exe
|
||||
${AQT_PREBUILD_BASE_URL}/aqt.exe
|
||||
${aqt_path} SHOW_PROGRESS)
|
||||
execute_process(COMMAND ${aqt_path} ${install_args}
|
||||
WORKING_DIRECTORY ${base_path})
|
||||
elseif (APPLE)
|
||||
set(aqt_path "${base_path}/aqt-macos")
|
||||
file(DOWNLOAD
|
||||
${AQT_PREBUILD_BASE_URL}/aqt-macos
|
||||
${aqt_path} SHOW_PROGRESS)
|
||||
execute_process(COMMAND chmod +x ${aqt_path})
|
||||
execute_process(COMMAND ${aqt_path} ${install_args}
|
||||
WORKING_DIRECTORY ${base_path})
|
||||
else()
|
||||
# aqt does not offer binary releases for other platforms, so download and run from pip.
|
||||
set(aqt_install_path "${base_path}/aqt")
|
||||
|
|
Reference in New Issue