diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:11:20 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:11:20 +0000 |
| commit | f556d61c7360b2dd850ac8712d293d8b2be02bc5 (patch) | |
| tree | 3926acb2e9c41df14957ca6a8a287ac8d20b60d4 /BuildTools/Scripts | |
| parent | removed m_isDXIL flag, detect DXIL by bytecode (diff) | |
| parent | Updated third-party modules (diff) | |
| download | DiligentCore-f556d61c7360b2dd850ac8712d293d8b2be02bc5.tar.gz DiligentCore-f556d61c7360b2dd850ac8712d293d8b2be02bc5.zip | |
Merge branch 'master' into mesh_shader
Diffstat (limited to 'BuildTools/Scripts')
| -rw-r--r-- | BuildTools/Scripts/appveyor/install.bat | 2 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/before_install.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/Scripts/appveyor/install.bat b/BuildTools/Scripts/appveyor/install.bat index 54e2c324..d5b13752 100644 --- a/BuildTools/Scripts/appveyor/install.bat +++ b/BuildTools/Scripts/appveyor/install.bat @@ -1,4 +1,4 @@ -set CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-win64-x64.zip" +set CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win64-x64.zip" appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip 7z x cmake.zip -oC:\projects\deps > nul move C:\projects\deps\cmake-* C:\projects\deps\cmake diff --git a/BuildTools/Scripts/travis/before_install.sh b/BuildTools/Scripts/travis/before_install.sh index 6b65516d..1d1e9890 100755 --- a/BuildTools/Scripts/travis/before_install.sh +++ b/BuildTools/Scripts/travis/before_install.sh @@ -1,4 +1,4 @@ -CMAKE_VERSION="3.17.0" +CMAKE_VERSION="3.18.2" VULKAN_SDK_VER="1.2.135.0" if [ "$TRAVIS_OS_NAME" = "osx" ]; then |