From fe565da0b7c52d627d6bbf06ca4999a2a702225d Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 26 Mar 2019 19:02:44 -0700 Subject: Updated SPIRV-Cross build scripts --- External/CMakeLists.txt | 10 +++++----- External/SPIRV-Cross | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'External') diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt index f06ea3b2..16f374ca 100644 --- a/External/CMakeLists.txt +++ b/External/CMakeLists.txt @@ -52,12 +52,12 @@ if(VULKAN_SUPPORTED) list(APPEND INSTALL_TARGETS glslang OGLCompiler OSDependent SPIRV HLSL) endif() - list(APPEND INSTALL_TARGETS SPIRVCross) - + set(SPIRV_CROSS_CLI OFF CACHE BOOL "Build the CLI binary. Requires SPIRV_CROSS_STATIC.") + set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "Enable SPIRV-Cross tests.") add_subdirectory(SPIRV-Cross) - set_target_properties(SPIRVCross PROPERTIES - FOLDER Core/External - ) + set_directory_root_folder("SPIRV-Cross" "Core/External/SPIRV-Cross") + + list(APPEND INSTALL_TARGETS spirv-cross-core) if(INSTALL_DILIGENT_CORE) install(TARGETS ${INSTALL_TARGETS} diff --git a/External/SPIRV-Cross b/External/SPIRV-Cross index 51927e88..e02b2e73 160000 --- a/External/SPIRV-Cross +++ b/External/SPIRV-Cross @@ -1 +1 @@ -Subproject commit 51927e884cd99ce87269b5e0e10b806b1d3b0b0b +Subproject commit e02b2e731701719e0b125f204666623711cadbda -- cgit v1.2.3