Update cmake in SPIR-V tools build for glslang yet again

baldurk · Dec 16, 2024 · ff04b1c · ff04b1c
1 parent 6fcf607
commit ff04b1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/util/spirv-plugins/_build.sh b/util/spirv-plugins/_build.sh
@@ -20,7 +20,7 @@ else
 	export CC=clang CXX=clang++ CFLAGS="-fPIC -fvisibility=hidden -stdlib=libc++" LDFLAGS="-nostdlib++ -Wl,--start-group /usr/lib/libc++.a /usr/lib/libc++fs.a /usr/lib/libc++abi.a -lpthread"
 	export CXXFLAGS="${CFLAGS}"
 
-	export PATH=$(pwd)/cmake-3.26.2-linux-x86_64/bin:$PATH
+	export PATH=$(pwd)/$(ls -d cmake* | grep -v tar.gz | sort -n | tail -n 1)/bin:$PATH
 fi
 
 ##### SPIRV-Cross

diff --git a/util/spirv-plugins/docker/prepare.sh b/util/spirv-plugins/docker/prepare.sh
@@ -4,10 +4,10 @@ set -x
 
 # Get new cmake for glslang and spirv-tools
 
-wget https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.tar.gz
-tar -zxvf cmake-3.26.2-linux-x86_64.tar.gz
+wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.tar.gz
+tar -zxvf cmake-3.27.9-linux-x86_64.tar.gz
 
-export PATH=$(pwd)/cmake-3.26.2-linux-x86_64/bin:$PATH
+export PATH=$(pwd)/cmake-3.27.9-linux-x86_64/bin:$PATH
 
 # Update to newer clang and libc++ for spirv-tools...