Merge ancillary libraries into main glslang library and stub originals
This commit is contained in:
parent
0dc6711e5a
commit
4f01996c9d
13 changed files with 181 additions and 95 deletions
|
|
@ -97,6 +97,7 @@ option(GLSLANG_TESTS "Enable glslang testing" ${GLSLANG_TESTS_DEFAULT})
|
|||
# Always expose this as an option, so the defaults can be overridden.
|
||||
option(GLSLANG_ENABLE_INSTALL "Enable glslang installation" ${GLSLANG_ENABLE_INSTALL_DEFAULT})
|
||||
|
||||
option(ENABLE_SPIRV "Enables SPIRV output support" ON)
|
||||
option(ENABLE_SPVREMAPPER "Enables building of SPVRemapper" ON)
|
||||
|
||||
option(ENABLE_GLSLANG_BINARIES "Builds glslang and spirv-remap" ON)
|
||||
|
|
@ -125,6 +126,10 @@ endif()
|
|||
|
||||
option(ENABLE_PCH "Enables Precompiled header" ON)
|
||||
|
||||
if(ENABLE_SPIRV)
|
||||
add_compile_definitions(ENABLE_SPIRV)
|
||||
endif()
|
||||
|
||||
if(ENABLE_HLSL)
|
||||
add_compile_definitions(ENABLE_HLSL)
|
||||
endif()
|
||||
|
|
@ -313,11 +318,13 @@ else()
|
|||
add_definitions(-DENABLE_OPT=0)
|
||||
endif()
|
||||
|
||||
if(ENABLE_SPIRV)
|
||||
add_subdirectory(SPIRV)
|
||||
endif()
|
||||
add_subdirectory(glslang)
|
||||
if(ENABLE_GLSLANG_BINARIES)
|
||||
add_subdirectory(StandAlone)
|
||||
endif()
|
||||
add_subdirectory(SPIRV)
|
||||
|
||||
if(GLSLANG_TESTS)
|
||||
enable_testing()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue