Skip to content

CMakeLists: Fix compilation of glslang in cases where it hasn't been linked against SPIRV-Tools #14007

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CMakeLists: Fix compilation of glslang in cases where it hasn't been linked against SPIRV-Tools #14007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,15 @@ dolphin_find_optional_system_library_pkgconfig(FMT

add_subdirectory(Externals/imgui)
add_subdirectory(Externals/implot)
dolphin_find_optional_system_library(glslang Externals/glslang 15.0)

# A few distributions (mainly Debian-based ones) distribute glslang without linking it against SPIRV-Tools
find_package(SPIRV-Tools)
if(SPIRV-Tools_FOUND)
dolphin_find_optional_system_library(glslang Externals/glslang 15.0)
target_link_libraries(glslang::glslang INTERFACE SPIRV-Tools)
else()
dolphin_add_bundled_library(glslang OFF Externals/glslang)
endif()
# SPIRV-Cross is used on Windows for GLSL to HLSL conversion for the Direct3D 11 and Direct3D 12
# video backends, and on Apple devices for the Metal video backend.
if(WIN32 OR APPLE)
Expand Down