diff options
Diffstat (limited to 'share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml')
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml index 9cf6aa0782..17ffdfe9bf 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflow_build_qmake.yml @@ -45,6 +45,11 @@ jobs: execute_process( COMMAND sudo apt install libgl1-mesa-dev ) + elseif ("${{ runner.os }}" STREQUAL "Windows") + # get JOM + file(DOWNLOAD "https://download.qt.io/official_releases/jom/jom.zip" ./jom.zip SHOW_PROGRESS) + file(MAKE_DIRECTORY ./jom) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../jom.zip WORKING_DIRECTORY ./jom) endif() - name: Download Qt @@ -210,7 +215,7 @@ jobs: set(make_program make -j ${N}) if ("${{ runner.os }}" STREQUAL "Windows") - set(make_program "qtcreator/bin/jom") + set(make_program "jom/jom") endif() execute_process( |