From bc6f8857fbb5c3a9a5187f69dd24a7c1b1a23fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Sat, 1 Mar 2025 14:12:12 +0100
Subject: [PATCH] Fix CMake errors; CMake removed version compatibility with
 CMake 3.5 and below. This includes bumping glslang, as it was still using
 CMake version compatibility <3.0.

---
 CMakeLists.txt                     | 11 +----------
 cmake/ports/glslang/CONTROL        |  2 +-
 cmake/ports/glslang/portfile.cmake |  4 ++--
 tools/shadergen.py                 |  2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe642a329..c5fb2acc31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,8 @@
 # Copyright 2013-2019 High Fidelity, Inc.
 # Copyright 2019-2021 Vircadia contributors.
-# Copyright 2020-2023 Overte e.V.
+# Copyright 2020-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
-# If we're running under the gradle build, HIFI_ANDROID will be set here, but
-# ANDROID will not be set until after the `project` statement.  This is the *ONLY*
-# place you need to use `HIFI_ANDROID` instead of `ANDROID`
-if (WIN32 AND NOT HIFI_ANDROID)
-  cmake_minimum_required(VERSION 3.7)
-else()
-  cmake_minimum_required(VERSION 3.2)
-endif()
-
 # 3.14 is the minimum version that supports symlinks on Windows
 cmake_minimum_required(VERSION 3.14)
 
diff --git a/cmake/ports/glslang/CONTROL b/cmake/ports/glslang/CONTROL
index 74a2530e4c..026b3e9926 100644
--- a/cmake/ports/glslang/CONTROL
+++ b/cmake/ports/glslang/CONTROL
@@ -1,3 +1,3 @@
 Source: glslang
-Version: untagged-048c4dbc7f021224a933-1
+Version: 11.13.0
 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
diff --git a/cmake/ports/glslang/portfile.cmake b/cmake/ports/glslang/portfile.cmake
index 6a5fe2b5bf..47e0105ec9 100644
--- a/cmake/ports/glslang/portfile.cmake
+++ b/cmake/ports/glslang/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/glslang
-  REF untagged-048c4dbc7f021224a933
-  SHA512 e3097dd2db88320982d7da1ddce138839daf3251935909c3998a114aeadd408760b26b2d7c7ee547fb0519895ac1853a45c23df2eecf61135849b080252e9dec
+  REF 11.13.0
+  SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b
   HEAD_REF master
 )
 
diff --git a/tools/shadergen.py b/tools/shadergen.py
index 1f4acae915..e74557ddd6 100644
--- a/tools/shadergen.py
+++ b/tools/shadergen.py
@@ -217,7 +217,7 @@ def processCommand(line):
         executeSubprocess(scribeArgs)
 
         # Generate the un-optimized output
-        executeSubprocess([glslangExec, '-V110', '-o', upoptSpirvFile, unoptGlslFile])
+        executeSubprocess([glslangExec, '-V100', '-o', upoptSpirvFile, unoptGlslFile])
 
         # Optimize the SPIRV
         executeSubprocess([spirvOptExec, '-O', '-o', spirvFile, upoptSpirvFile])