diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-27 02:02:44 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-27 02:02:44 +0000 |
| commit | fe565da0b7c52d627d6bbf06ca4999a2a702225d (patch) | |
| tree | 123261f1a848454ba618ff6853e6d7c1b642c675 /External | |
| parent | Revert "Allocating spirv-cross parser and compiler on the heap to fix crash o... (diff) | |
| download | DiligentCore-fe565da0b7c52d627d6bbf06ca4999a2a702225d.tar.gz DiligentCore-fe565da0b7c52d627d6bbf06ca4999a2a702225d.zip | |
Updated SPIRV-Cross build scripts
Diffstat (limited to 'External')
| -rw-r--r-- | External/CMakeLists.txt | 10 | ||||
| m--------- | External/SPIRV-Cross | 0 |
2 files changed, 5 insertions, 5 deletions
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 -Subproject 51927e884cd99ce87269b5e0e10b806b1d3b0b0 +Subproject e02b2e731701719e0b125f204666623711cadbd |