summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorSimon Kallweit <64953474+skallweitNV@users.noreply.github.com>2025-06-13 18:02:23 +0200
committerGitHub <noreply@github.com>2025-06-13 09:02:23 -0700
commitad6478f1346d3f004d88ce8c7e38479520bb6656 (patch)
treeb090e6f002e11bf69e6d48a943d0a6bcdac2311f /external
parent0382c5116208a944da0153c94d30e1c21ae4e49c (diff)
Re-enable running slang-rhi-tests (#7360)
* enable building slang-rhi-tests * re-enable running slang-rhi-tests * format code * fix typo * update slang-rhi * build slang-rhi-tests without glfw dependency * skip fence tests --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> Co-authored-by: amey asgaonkar <160177341+aasgaonkar@users.noreply.github.com>
Diffstat (limited to 'external')
-rw-r--r--external/CMakeLists.txt8
m---------external/slang-rhi0
2 files changed, 8 insertions, 0 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 97fd7c1f7..2b37e1ef4 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -182,6 +182,8 @@ target_include_directories(
# slang-rhi
if(SLANG_ENABLE_SLANG_RHI)
set(SLANG_RHI_BUILD_FROM_SLANG_REPO ON)
+ set(SLANG_RHI_BUILD_TESTS ON)
+ set(SLANG_RHI_BUILD_TESTS_WITH_GLFW OFF)
set(SLANG_RHI_INSTALL OFF)
set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin)
set(SLANG_RHI_FETCH_SLANG OFF)
@@ -219,6 +221,12 @@ if(SLANG_ENABLE_SLANG_RHI)
${system}
)
endif()
+
+ # Output slang-rhi-tests to the bin directory so we can run it easily.
+ set_target_properties(
+ slang-rhi-tests
+ PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIG>/bin
+ )
endif()
# Tidy things up:
diff --git a/external/slang-rhi b/external/slang-rhi
-Subproject d256b49563e2d428e36902648cf49b253e42f71
+Subproject ee3844f7c15a52991536314563aa7188d6f59d2