From ad6478f1346d3f004d88ce8c7e38479520bb6656 Mon Sep 17 00:00:00 2001
From: Simon Kallweit <64953474+skallweitNV@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:02:23 +0200
Subject: 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>
---
 external/CMakeLists.txt | 8 ++++++++
 external/slang-rhi      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'external')

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
index d256b4956..ee3844f7c 160000
--- a/external/slang-rhi
+++ b/external/slang-rhi
@@ -1 +1 @@
-Subproject commit d256b49563e2d428e36902648cf49b253e42f713
+Subproject commit ee3844f7c15a52991536314563aa7188d6f59d2d
-- 
cgit v1.2.3