Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Fix windows c++20 compiler error by updating Qt to 5.14.2

Browse Source
This commit is contained in:
Elias Steurer 2020-08-10 17:42:49 +02:00
parent 13b7bd80fa
commit 0b31d2b31a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -18,14 +18,18 @@ build:windows:
- cmd /c " `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > `"$tempFile`" " - cmd /c " `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > `"$tempFile`" "
- Get-Content $tempFile | Foreach-Object {if($_ -match "^(.*?)=(.*)$"){Set-Content "env:\$($matches[1])" $matches[2]}} - Get-Content $tempFile | Foreach-Object {if($_ -match "^(.*?)=(.*)$"){Set-Content "env:\$($matches[1])" $matches[2]}}
- Remove-Item $tempFile - Remove-Item $tempFile
- $Env:Path += ';C:\Qt\5.14.0\msvc2017_64\bin' - $Env:Path += ';C:\Qt\5.14.2\msvc2017_64\bin'
- $Env:Path += ';C:\Qt\Tools\QtCreator\bin' - $Env:Path += ';C:\Qt\Tools\QtCreator\bin'
- $env:path -split ";" - $env:path -split ";"
cache:
key: ${CI_RUNNER_DESCRIPTION}
paths:
- Common\vcpkg\
script: script:
- .\install_dependencies_windows.bat - .\install_dependencies_windows.bat
- mkdir BUILD_WINDOWS - mkdir BUILD_WINDOWS
- cd BUILD_WINDOWS - cd BUILD_WINDOWS
- cmake.exe ../ -DCMAKE_PREFIX_PATH=c:/Qt/5.14.0/msvc2017 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B. - cmake.exe ../ -DCMAKE_PREFIX_PATH=c:/Qt/5.14.2/msvc2017 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.
- cmake.exe --build . --target all - cmake.exe --build . --target all
- cd bin - cd bin
- windeployqt.exe --release --qmldir ../../Client/qml Client.exe - windeployqt.exe --release --qmldir ../../Client/qml Client.exe