SPIR-V header fixes

Author: franz

CMakeLists.txt

@@ -233,8 +233,8 @@ endif(APPLE)
 
 message(STATUS "CLConform_LIBRARIES: ${CLConform_LIBRARIES}")
 
-include_directories(SYSTEM ${CL_INCLUDE_DIR})
-include_directories(SYSTEM ${SPIRV_INCLUDE_DIR}/include)
+include_directories(${CL_INCLUDE_DIR})
+include_directories(${SPIRV_INCLUDE_DIR})
 include_directories(${CLConform_SOURCE_DIR}/test_common/harness
                     ${CLConform_SOURCE_DIR}/test_common/gles
                     ${CLConform_SOURCE_DIR}/test_common/gl

test_conformance/api/CMakeLists.txt

@@ -50,9 +50,9 @@ add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/spirv_capability_deps.def
     COMMENT "Generating spirv_capability_deps.def..."
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_spirv_capability_deps.py
-            --grammar "${SPIRV_INCLUDE_DIR}/include/spirv/unified1/spirv.core.grammar.json"
+            --grammar "${SPIRV_INCLUDE_DIR}/spirv.core.grammar.json"
             --output "${CMAKE_CURRENT_BINARY_DIR}/spirv_capability_deps.def"
-    DEPENDS generate_spirv_capability_deps.py "${SPIRV_INCLUDE_DIR}/include/spirv/unified1/spirv.core.grammar.json"
+    DEPENDS generate_spirv_capability_deps.py "${SPIRV_INCLUDE_DIR}/spirv.core.grammar.json"
     USES_TERMINAL
     VERBATIM)
 

test_conformance/api/test_spirv_queries.cpp

@@ -19,7 +19,7 @@
 #include <vector>
 
 #define SPV_ENABLE_UTILITY_CODE
-#include <spirv/unified1/spirv.hpp>
+#include <spirv.hpp>
 
 static bool is_spirv_version_supported(cl_device_id deviceID,
                                        const std::string& version)