Skip to content

Commit

Permalink
kokoro: use CMake 3.31.2
Browse files Browse the repository at this point in the history
Glslang requires CMake 3.27 or later

Fixed: #1462
  • Loading branch information
dneto0 committed Dec 13, 2024
1 parent 65a9e40 commit e639dbc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kokoro/android-release/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -e
# Display commands being run.
set -x

using cmake-3.17.2
using cmake-3.31.2
using ninja-1.10.0
using ndk-r25c # Sets ANDROID_NDK_HOME, pointing at the NDK's root dir

Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -x # Display commands being run.
SKIP_TESTS="False"
BUILD_TYPE="Debug"

using cmake-3.17.2
using cmake-3.31.2
using ninja-1.10.0
using python-3.12

Expand Down
2 changes: 2 additions & 0 deletions kokoro/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ set VS_VERSION=%2

:: Force usage of python 3.6.
set PATH=C:\python36;%PATH%
:: Glslang requires cmake 3.27 or later
set PATH=C:\cmake-3.31.2\bin;%PATH%

cd %SRC%
python utils\git-sync-deps
Expand Down

0 comments on commit e639dbc

Please sign in to comment.