From dc1a8196cf4e717af8b1e64cf82ca3d13e4dd2d8 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 11 Jan 2017 14:50:16 -0700
Subject: [PATCH] Infrastructure: Support standard build with ENABLE_HLSL set
to off.
---
CMakeLists.txt | 2 +-
StandAlone/CMakeLists.txt | 2 +-
glslang/Include/revision.h | 2 +-
gtests/CMakeLists.txt | 14 ++++++++++----
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ddc18354..d45372016 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 e7e9a2af3..597d81300 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 b70f65784..047e4ed64 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 268caff7f..a06442dfb 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()
--
GitLab