Skip to content

Commit

Permalink
meson: add glslang lib for 15.0.0 linking
Browse files Browse the repository at this point in the history
Glslang 15.0.0 moved some code around, add also linking to glslang,
while this is not needed for older versions, it will still work.

Unfortunately CMake config embedded in distributions is not usable
without installing additional package like glslang-tools, because at
least Ubuntu splits it. On Arch it would work, but generally the CMake
config require cmake binary to work also, so let's keep it as-is for
now.
  • Loading branch information
kasper93 committed Dec 2, 2024
1 parent 5ba1376 commit 056b852
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/glsl/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ elif not glslang_req.disabled()

glslang_deps += spirv

# Glslang 15.0.0 moved some code around, add also linking to glslang, while
# this is not needed for older versions, it will still work.
glslang_deps += cxx.find_library('glslang', required: required, static: static)

if static
glslang_deps += [
# Always required for static linking
Expand Down

0 comments on commit 056b852

Please sign in to comment.