From f620cc9b235fa0dcdef7379e5b81de2ddc61dc4e Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Fri, 20 Jul 2018 12:51:58 +0200 Subject: [PATCH] Ensure that SPIR-V Headers are always present Components: Vulkan, OpenGL, Framework VK-GL-CTS public issue: 108 Change-Id: I6172080e4c025b6ad671ca9c33e08f6fdf8ded6a --- CMakeLists.txt | 6 +++++- external/openglcts/README.md | 3 ++- external/vulkancts/README.md | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d88f26b..3caa6d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,11 @@ add_subdirectory(external/glslang) add_subdirectory(external/spirv-tools) # spirv-headers -include_directories(external/spirv-headers/src/include) +set(SPIRV_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/external/spirv-headers/src/include") +if (NOT EXISTS ${SPIRV_INCLUDE_PATH}) + message(FATAL_ERROR "SPIR-V headers not found, please run external/fetch_sources.py") +endif() +include_directories(${SPIRV_INCLUDE_PATH}) include_directories(${PNG_INCLUDE_PATH}) diff --git a/external/openglcts/README.md b/external/openglcts/README.md index f805c95..7ec07cf 100644 --- a/external/openglcts/README.md +++ b/external/openglcts/README.md @@ -212,7 +212,8 @@ add_definitions(-DHKEMBEDDEDFILESYSTEM) ### Building the Tests -To build the framework, you need first to download sources for zlib, libpng. +To build the framework, you need first to download sources for zlib, libpng, glslang, +spirv-headers, and spirv-tools. To download sources, run: diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md index d42a7f8..16f54e1 100644 --- a/external/vulkancts/README.md +++ b/external/vulkancts/README.md @@ -43,7 +43,7 @@ Building CTS ------------ To build dEQP, you need first to download sources for zlib, libpng, glslang, -and spirv-tools. +spirv-headers, and spirv-tools. To download sources, run: -- 2.7.4