Skip to content

Commit 18d24d1

Browse files
committed
Distribute slang-glsl-module.bin in release packages.
1 parent ae778e3 commit 18d24d1

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

CMakeLists.txt

+12
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,18 @@ install(
361361
PATTERN ".*" EXCLUDE
362362
)
363363

364+
# Install slang-glsl-module.bin if it exists.
365+
get_target_property(SLANG_BOOTSTRAP_PATH slang-bootstrap RUNTIME_OUTPUT_DIRECTORY)
366+
set(GLSL_MODULE_PATH ${SLANG_BOOTSTRAP_PATH}/slang-glsl-module.bin)
367+
368+
#if(EXISTS ${GLSL_MODULE_PATH})
369+
message(STATUS "glsl module path: " ${GLSL_MODULE_PATH})
370+
install(
371+
FILES ${GLSL_MODULE_PATH}
372+
DESTINATION bin
373+
)
374+
#endif()
375+
364376
include(CPack)
365377

366378
# Write basic package config version file using standard CMakePackageConfigHelpers utility

source/slang/slang-options.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -2763,9 +2763,7 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
27632763
case OptionKind::Help:
27642764
{
27652765
SLANG_RETURN_ON_FAIL(_parseHelp(arg));
2766-
2767-
// We retun an error so after this has successfully passed, we quit
2768-
return SLANG_FAIL;
2766+
return SLANG_OK;
27692767
}
27702768
case OptionKind::EmitSpirvViaGLSL:
27712769
case OptionKind::EmitSpirvDirectly:

0 commit comments

Comments
 (0)