diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ddc1835458fb011e24938612ba215d706d69c86..d4537201696587405f03a2b684771e5700befbc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,5 +71,5 @@ endif() add_subdirectory(SPIRV) if(ENABLE_HLSL) add_subdirectory(hlsl) -endif() +endif(ENABLE_HLSL) add_subdirectory(gtests) diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index e7e9a2af31a02e0fe55b67b131df80a90bab0f35..597d813007ec54e47c4250e5ca462be3880e6952 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -28,7 +28,7 @@ set(LIBRARIES if(ENABLE_HLSL) set(LIBRARIES ${LIBRARIES} HLSL) -endif() +endif(ENABLE_HLSL) if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index b70f657847fd9c8180d27180312f195ca97200a7..047e4ed642454d36bdfa908d5666adc6cd94aed3 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -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" diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt index 268caff7f934d2100616c668cea03f89fc4eee2b..a06442dfb0f4e43e8f976d2bd2b7c6493ba862fe 100644 --- a/gtests/CMakeLists.txt +++ b/gtests/CMakeLists.txt @@ -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()