Skip to content

Commit 50a4ff2

Browse files
committed
build: Fix undefined SPIRV symbols on linux
For some reason on Fedora 42 linking glsl doesn't link it's SPIRV-Tools dependencies. Fixes #1544
1 parent 6df3e17 commit 50a4ff2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ find_package(pugixml REQUIRED)
134134
find_package(RapidJSON REQUIRED)
135135
find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)
136136
find_package(libzip REQUIRED)
137+
#find_package(SPIRV-Tools REQUIRED)
138+
#find_package(SPIRV-Tools-opt REQUIRED)
137139
find_package(glslang REQUIRED)
138140
find_package(ZLIB REQUIRED)
139141
find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available

src/Cafe/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ set_property(TARGET CemuCafe PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CON
549549

550550
target_include_directories(CemuCafe PUBLIC "../")
551551

552-
if (glslang_VERSION VERSION_LESS "15.0.0")
552+
if (glslang_VERSION VERSION_LESS "15.0.0" OR glslang_VERSION VERSION_GREATER_EQUAL "15.0.3")
553553
set(glslang_target "glslang::SPIRV")
554554
else()
555555
set(glslang_target "glslang")

0 commit comments

Comments
 (0)