diff options
| author | Paul Thomson <paulthomson@google.com> | 2020-01-29 10:52:23 +0000 |
|---|---|---|
| committer | Paul Thomson <paulthomson@google.com> | 2020-01-29 10:52:23 +0000 |
| commit | 05107f5ee729b121568c2c7dbd761fce17786d96 (patch) | |
| tree | b70e4f360d1951c1322fa0a9abf4408324791607 /third_party | |
| parent | f2f0ce29150b4d27898f7307c5b0ccc277700217 (diff) | |
| parent | 0556811aeaad846f4bacbbd03e05e61fbfe1e545 (diff) | |
| download | amber-05107f5ee729b121568c2c7dbd761fce17786d96.tar.gz | |
Merge commit '0556811aeaad846f4bacbbd03e05e61fbfe1e545'
Change-Id: I91c83b44ba450714c7c0419ace1c78d0d22c8625
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index db865ad..356acb1 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -62,6 +62,7 @@ if (${AMBER_USE_LOCAL_VULKAN}) set(BUILD_WSI_XLIB_SUPPORT OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vulkan-loader) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vulkan-validationlayers) endif() if (${AMBER_ENABLE_SWIFTSHADER}) @@ -130,10 +131,11 @@ if (${AMBER_ENABLE_DXC}) endif() if (${AMBER_ENABLE_CLSPV}) - set(CLSPV_LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm" CACHE STRING "") - set(CLSPV_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-clang" CACHE STRING "") + set(CLSPV_LLVM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/llvm" CACHE STRING "") + set(CLSPV_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clspv-llvm/clang" CACHE STRING "") set(SPIRV_HEADERS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-headers" CACHE STRING "") set(SPIRV_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools" CACHE STRING "") + set(LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL 0 FORCE) set(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN ON CACHE STRING "") set(LLVM_BUILD_STATIC ON CACHE BOOL "") |