From 0507cc47f26be5bc487b4957d0010c8ac0d96ad5 Mon Sep 17 00:00:00 2001 From: Vasyl Skorych Date: Sun, 16 Jun 2024 12:20:03 +0200 Subject: [PATCH] ci: Update Qt --- .github/workflows/build_windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 522da571..e185be07 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -21,7 +21,7 @@ env: # Versions QT_VERSION: 5.15.2 QT_VS_VERSION: msvc2019 - QT_VS_ADDIN_VERSION: 2.7.2 + QT_VS_ADDIN_VERSION: 3.0.2 ZLIB_VERSION: 1.3 SUNDIALS_VERSION: 6.4.1 HDF5_VERSION: 1.12.2 @@ -147,7 +147,7 @@ jobs: - name: Build working-directory: ${{github.workspace}} env: - QtToolsPath: ${{env.Qt5_DIR}}/bin + QtToolsPath: ${{env.QT_ROOT_DIR}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild # Add additional options to the MSBuild command line here: see https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference. run: msbuild -maxCpuCount -verbosity:minimal -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} @@ -369,7 +369,7 @@ jobs: - name: Build x86 working-directory: ${{github.workspace}} env: - QtToolsPath: ${{env.Qt5_DIR}}/../${{env.QT_VS_VERSION}}/bin + QtToolsPath: ${{env.QT_ROOT_DIR}}/../${{env.QT_VS_VERSION}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild run: | msbuild -maxCpuCount -verbosity:minimal -property:Configuration=Debug -property:Platform=Win32 ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} @@ -378,7 +378,7 @@ jobs: - name: Build x64 working-directory: ${{github.workspace}} env: - QtToolsPath: ${{env.Qt5_DIR}}/../${{env.QT_VS_VERSION}}_64/bin + QtToolsPath: ${{env.QT_ROOT_DIR}}/../${{env.QT_VS_VERSION}}_64/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild run: | msbuild -maxCpuCount -verbosity:minimal -property:Configuration=Debug -property:Platform=x64 ${{env.SOLUTION_FILE_PATH}}/${{env.SOLUTION_FILE_NAME}} @@ -387,7 +387,7 @@ jobs: - name: Build Installer working-directory: ${{github.workspace}} env: - QtToolsPath: ${{env.Qt5_DIR}}/bin + QtToolsPath: ${{env.QT_ROOT_DIR}}/bin QtMsBuild: ${{github.workspace}}/ExternalLibraries/qtvsaddin/QtMsBuild run: msbuild -maxCpuCount -verbosity:minimal -property:Configuration=${{env.BUILD_CONFIGURATION}} -property:Platform=${{env.BUILD_PLATFORM}} -property:SolutionDir=${{github.workspace}}/ -property:SolutionPath=${{github.workspace}}/${{env.SOLUTION_FILE_NAME}} -property:QtInstallDir=${{github.workspace}}/ExternalLibraries/qt/Qt/${{env.QT_VERSION}}/${{env.QT_VS_VERSION}}_64/ -property:InstallerPlatforms=Both -property:InstallerDocumentation=true -property:InstallerSDK=true -property:InstallerSDKLibs=Sources -property:InstallerPreBuild=false -property:InstallerPreDocs=false ${{env.INSTALLER_PROJECT_PATH}}