diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-10 13:27:33 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-10 13:27:33 +0200 |
| commit | cb6b98b08a3a0e4530fdfe8b318d4bb2e162bee3 (patch) | |
| tree | 47d80e54f50410ba371ba3c19075e0d2a1639d88 | |
| parent | 2570df515b89682ca5894a6d2fa1f5507118b097 (diff) | |
| download | qtlocation-mapboxgl-cb6b98b08a3a0e4530fdfe8b318d4bb2e162bee3.tar.gz | |
[wip] Visual Studio 2017 build scripts
| -rw-r--r-- | scripts/windows-build-appveyor.bat | 12 | ||||
| -rw-r--r-- | scripts/windows-build-local.bat | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scripts/windows-build-appveyor.bat b/scripts/windows-build-appveyor.bat index 231f48dcb7..e0020aa931 100644 --- a/scripts/windows-build-appveyor.bat +++ b/scripts/windows-build-appveyor.bat @@ -28,18 +28,20 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR CD %APPVEYOR_BUILD_FOLDER%\build IF %ERRORLEVEL% NEQ 0 GOTO ERROR -REM call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 -call "C:\Program Files (x86)\Microsoft Visual Studio\Preview\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 +SET VSCMD=C:\Program Files (x86)\Microsoft Visual Studio\Preview\Enterprise\VC\Auxiliary\Build\vcvarsall.bat +IF "%APPVEYOR%"=="True" SET VSCMD=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat +CALL "%VSCMD%" amd64 IF %ERRORLEVEL% NEQ 0 GOTO ERROR -cmake -G "Visual Studio 15 Win64" ^ +REM -T v141_clang_c2 ^ +cmake -G "Visual Studio 15 2017 Win64" ^ +-DCMAKE_BUILD_TYPE=%configuration% ^ -DMBGL_PLATFORM=qt ^ -DWITH_QT_DECODERS=ON ^ -DWITH_QT_I18N=ON ^ -DWITH_NODEJS=OFF ^ -DCMAKE_BUILD_TYPE=Release ^ --DCMAKE_PREFIX_PATH=C:\Qt\5.11.1\msvc2017_64\lib\cmake ^ --DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" .. +-DCMAKE_PREFIX_PATH=C:\Qt\5.11.1\msvc2017_64\lib\cmake .. IF %ERRORLEVEL% NEQ 0 GOTO ERROR REM cmake --build . -- -j %NUMBER_OF_PROCESSORS% diff --git a/scripts/windows-build-local.bat b/scripts/windows-build-local.bat index 09e3938a2a..07ca620fc8 100644 --- a/scripts/windows-build-local.bat +++ b/scripts/windows-build-local.bat @@ -8,6 +8,8 @@ REM otherwise path references will not work IF NOT EXIST C:\Qt\5.11.1\msvc2017_64\lib SET EL=1 && ECHO QT not found && GOTO ERROR SET PATH=C:\Program Files\7-Zip;%PATH% +REM set env vars normally set by AppVeyor +SET configuration=Release SET APPVEYOR_BUILD_FOLDER=%CD% SET CMAKE_VERSION=cmake-3.10.1-win64-x64 SET CMAKE_URL=https://cmake.org/files/v3.10/%CMAKE_VERSION%.zip |