From 313865d420bba7bb3327460c367c7526f566a74e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 23 Dec 2025 11:07:19 +0000 Subject: [PATCH 1/2] Simplfied the glslang find_package code to make it compatible with glslang 16.x --- CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50730936f..129909335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,18 +44,10 @@ set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level option(VSG_SUPPORTS_ShaderCompiler "Optional shader compiler support" ON) if (VSG_SUPPORTS_ShaderCompiler) - # Try looking for glslang 15 first. - set(GLSLANG_MIN_VERSION "15" CACHE STRING "glslang 14 is the earliest version that we think installs itself properly on all platforms. Other platforms may be able to use an earlier version") - find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG QUIET) - - if (NOT glslang_FOUND) - # fallback to trying glslang 14. - set(GLSLANG_MIN_VERSION "14") - find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG) - endif() + find_package(glslang CONFIG) if (glslang_FOUND) - set(FIND_DEPENDENCY_glslang "find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG REQUIRED)") + set(FIND_DEPENDENCY_glslang "find_package(glslang CONFIG REQUIRED)") else() message(WARNING "glslang not found. ShaderCompile support disabled.") set(VSG_SUPPORTS_ShaderCompiler 0) From 282846de0266462f5797d936b5304ef52868d23c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 23 Dec 2025 11:44:08 +0000 Subject: [PATCH 2/2] Quietend find_package(glslang..) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 129909335..a0b545a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level option(VSG_SUPPORTS_ShaderCompiler "Optional shader compiler support" ON) if (VSG_SUPPORTS_ShaderCompiler) - find_package(glslang CONFIG) + find_package(glslang CONFIG QUIET) if (glslang_FOUND) set(FIND_DEPENDENCY_glslang "find_package(glslang CONFIG REQUIRED)")