Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 10:19:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
Julian Groß 2025-03-01 14:12:12 +01:00
parent ddbddab1e0
commit bc6f8857fb
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -1,17 +1,8 @@
# Copyright 2013-2019 High Fidelity, Inc. # Copyright 2013-2019 High Fidelity, Inc.
# Copyright 2019-2021 Vircadia contributors. # Copyright 2019-2021 Vircadia contributors.
# Copyright 2020-2023 Overte e.V. # Copyright 2020-2025 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # 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 # 3.14 is the minimum version that supports symlinks on Windows
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)

2
cmake/ports/glslang/CONTROL
View file

@ -1,3 +1,3 @@
Source: glslang Source: glslang
Version: untagged-048c4dbc7f021224a933-1 Version: 11.13.0
Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator

4
cmake/ports/glslang/portfile.cmake
View file

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/glslang REPO KhronosGroup/glslang
REF untagged-048c4dbc7f021224a933 REF 11.13.0
SHA512 e3097dd2db88320982d7da1ddce138839daf3251935909c3998a114aeadd408760b26b2d7c7ee547fb0519895ac1853a45c23df2eecf61135849b080252e9dec SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b
HEAD_REF master HEAD_REF master
) )

2
tools/shadergen.py
View file

@ -217,7 +217,7 @@ def processCommand(line):
executeSubprocess(scribeArgs) executeSubprocess(scribeArgs)
# Generate the un-optimized output # Generate the un-optimized output
executeSubprocess([glslangExec, '-V110', '-o', upoptSpirvFile, unoptGlslFile]) executeSubprocess([glslangExec, '-V100', '-o', upoptSpirvFile, unoptGlslFile])
# Optimize the SPIRV # Optimize the SPIRV
executeSubprocess([spirvOptExec, '-O', '-o', spirvFile, upoptSpirvFile]) executeSubprocess([spirvOptExec, '-O', '-o', spirvFile, upoptSpirvFile])