diff --git a/appveyor-build.bat b/appveyor-build.bat index ae266a5c0..ec1fd0c24 100644 --- a/appveyor-build.bat +++ b/appveyor-build.bat @@ -8,18 +8,18 @@ SET PROJECT_DIR=%CD% ECHO PROJECT_DIR^: %PROJECT_DIR% ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS% ECHO cmake^: && cmake --version -IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found GOTO ERROR +IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK -FOR /F %%G IN ("--version") DO cmake %%G 2>&1 | findstr /C:"3.5.0" > nul && goto CMAKE_NOT_OK -GOTO CMAKE_OK +cmake --version | findstr /C:"3.7.0" && GOTO CMAKE_OK :CMAKE_NOT_OK -ECHO CMAKE NOT OK - downloading new CMake -IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.5/cmake-3.5.1-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip +SET CMAKE_VERSION=3.7.0-rc2 +ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION% +IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.7/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip IF %ERRORLEVEL% NEQ 0 GOTO ERROR -IF NOT EXIST cmake-3.5.1-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive" +IF NOT EXIST cmake-%CMAKE_VERSION%-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive" IF %ERRORLEVEL% NEQ 0 GOTO ERROR -SET PATH=%PROJECT_DIR%\cmake-3.5.1-win32-x86\bin;%PATH% +SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH% :CMAKE_OK ECHO CMAKE_OK diff --git a/build-local.bat b/build-local.bat index a90c0aa74..8598230f3 100644 --- a/build-local.bat +++ b/build-local.bat @@ -11,8 +11,7 @@ SET CONFIGURATION=Release FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH% -::SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.5.0-win32-x86\bin;%PATH% -SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.5.1-win32-x86\bin;%PATH% +SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.7.0-rc2-win32-x86\bin;%PATH% SET PATH=C:\Program Files\7-Zip;%PATH% powershell Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force