RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2024-11-27 13:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Infrastructure: Support standard build with ENABLE_HLSL set to off.

Browse Source
This commit is contained in:
John Kessenich 2017-01-11 14:50:16 -07:00
parent 65d538c832
commit dc1a8196cf
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -71,5 +71,5 @@ endif()
add_subdirectory(SPIRV)
if(ENABLE_HLSL)
add_subdirectory(hlsl)
endif()
endif(ENABLE_HLSL)
add_subdirectory(gtests)

2
StandAlone/CMakeLists.txt
View File

@ -28,7 +28,7 @@ set(LIBRARIES
if(ENABLE_HLSL)
set(LIBRARIES ${LIBRARIES} HLSL)
endif()
endif(ENABLE_HLSL)
if(WIN32)
set(LIBRARIES ${LIBRARIES} psapi)

2
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1759"
#define GLSLANG_REVISION "Overload400-PrecQual.1760"
#define GLSLANG_DATE "11-Jan-2017"

14
gtests/CMakeLists.txt
View File

@ -40,9 +40,15 @@ if (TARGET gmock)
${PROJECT_SOURCE_DIR}
${gmock_SOURCE_DIR}/include
${gtest_SOURCE_DIR}/include)
target_link_libraries(glslangtests PRIVATE
SPVRemapper glslang OSDependent OGLCompiler HLSL glslang
SPIRV glslang-default-resource-limits gmock)
set(LIBRARIES
SPVRemapper glslang OSDependent OGLCompiler glslang
SPIRV glslang-default-resource-limits)
if(ENABLE_HLSL)
set(LIBRARIES ${LIBRARIES} HLSL)
endif(ENABLE_HLSL)
target_link_libraries(glslangtests PRIVATE ${LIBRARIES} gmock)
add_test(NAME glslang-gtests
COMMAND glslangtests --test-root "${GLSLANG_TEST_DIRECTORY}")
COMMAND glslangtests --test-root "${GLSLANG_TEST_DIRECTORY}")
endif()