Skip to content
Snippets Groups Projects
Commit 6f762981 authored by hluk's avatar hluk
Browse files

Windows: Use Qt 5.12.4 builds


Signed-off-by: default avatarLukas Holecek <hluk@email.cz>
parent 0d203432
No related branches found
No related tags found
No related merge requests found
...@@ -6,12 +6,13 @@ image: ...@@ -6,12 +6,13 @@ image:
environment: environment:
matrix: matrix:
- QTDIR: C:\Qt\5.12\mingw73_32 - QTDIR: C:\Qt\5.12.4\mingw73_32
CMAKE_GENERATOR: MinGW Makefiles CMAKE_GENERATOR: MinGW Makefiles
MINGW_PATH: C:\Qt\Tools\mingw730_32 MINGW_PATH: C:\Qt\Tools\mingw730_32
- QTDIR: C:\Qt\5.12\msvc2017_64 - QTDIR: C:\Qt\5.12.4\msvc2017_64
CMAKE_GENERATOR: Visual Studio 15 2017 Win64 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR_ARCH: x64
CMD_VCVARS: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat' CMD_VCVARS: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat'
BUILD_SUB_DIR: Debug BUILD_SUB_DIR: Debug
......
...@@ -36,7 +36,7 @@ xcopy /F "%BuildPlugins%\*.dll" "%Destination%\plugins" || goto :error ...@@ -36,7 +36,7 @@ xcopy /F "%BuildPlugins%\*.dll" "%Destination%\plugins" || goto :error
choco install -y InnoSetup || goto :error choco install -y InnoSetup || goto :error
"C:\ProgramData\chocolatey\bin\ISCC.exe" "/O%APPVEYOR_BUILD_FOLDER%" "/DAppVersion=%AppVersion%" "/DRoot=%Destination%" "/DSource=%Source%" "%Source%\Shared\copyq.iss" || goto :error "C:\ProgramData\chocolatey\bin\ISCC.exe" "/O%APPVEYOR_BUILD_FOLDER%" "/DAppVersion=%AppVersion%" "/DRoot=%Destination%" "/DSource=%Source%" "%Source%\Shared\copyq.iss" || goto :error
set QT_LOGGING_TO_CONSOLE=1 set QT_FORCE_STDERR_LOGGING=1
"%Executable%" --help || goto :error "%Executable%" --help || goto :error
"%Executable%" --version || goto :error "%Executable%" --version || goto :error
"%Executable%" --info || goto :error "%Executable%" --info || goto :error
......
@echo on @echo on
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "%CMAKE_GENERATOR%" -DWITH_TESTS=ON cmake -H. -Bbuild -DWITH_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "%CMAKE_GENERATOR%" -A "%CMAKE_GENERATOR_ARCH%"
...@@ -3,7 +3,13 @@ ...@@ -3,7 +3,13 @@
set PATH=%QTDIR%\bin;%PATH% set PATH=%QTDIR%\bin;%PATH%
set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake
dir %QTDIR%\bin || goto :error
dir %QTDIR%\lib\cmake || goto :error
REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile. REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile.
if DEFINED MINGW_PATH set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=% if DEFINED MINGW_PATH set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%
if DEFINED CMD_VCVARSALL call %CMD_VCVARSALL% if DEFINED CMD_VCVARSALL call %CMD_VCVARSALL%
:error
exit /b %errorlevel%
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment