Skip to content

Commit c789753

Browse files
authored
Propagate test/install options to Glslang. Update Glslang (#1397)
A Glslang test needed an update to work around assumptions of the sign of a NaN. Fixes: #1396
1 parent e6187c7 commit c789753

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ vars = {
77

88
'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82',
99
'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c',
10-
'glslang_revision': '1e4f53ab2de355296de690583bd26818264b25ff',
10+
'glslang_revision': '05ba15169ea4b1471e18305786f12526600a7810',
1111
'googletest_revision': 'e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b',
1212
're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761',
1313
'spirv_headers_revision': '4f7b471f1a66b6d06462cd4ba57628cc0cd087d7',

third_party/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ endif()
8383

8484
if (NOT TARGET glslang)
8585
if (IS_DIRECTORY ${SHADERC_GLSLANG_DIR})
86+
if (SHADERC_ENABLE_TESTS)
87+
# Glslang tests are off by default. Turn them on if testing Shaderc.
88+
set(GLSLANG_TESTS ON)
89+
endif()
90+
set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>)
8691
add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
8792
endif()
8893
if (NOT TARGET glslang)

0 commit comments

Comments
 (0)