Skip to content

Simplified find package glslang so that glslang 16.x is supported out of the box. #1636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertosfield merged 2 commits into from
Dec 23, 2025
Merged

Simplified find package glslang so that glslang 16.x is supported out of the box. #1636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
313865d
Simplfied the glslang find_package code to make it compatible with gl…
robertosfield Dec 23, 2025
282846d
Quietend find_package(glslang..)
robertosfield Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 QUIET)

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)
Expand Down
Loading