diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2025-02-07 10:54:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-07 01:54:00 -0800 |
| commit | 8d47910e9a49267829ba01c23f5a784fdae431ba (patch) | |
| tree | c7590e2f1c666403e2a4015109f7b4f93a8ffd2d | |
| parent | 654b96933c31b077885f91a68310398c6dbbb3d6 (diff) | |
slang-rhi cmake integration (#6261)
* update slang-rhi cmake integration
* disable fetching slang
* update slang-rhi
| -rw-r--r-- | CMakePresets.json | 1 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 4 | ||||
| m--------- | external/slang-rhi | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakePresets.json b/CMakePresets.json index 6367ebee4..b0fa9b8bf 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -23,6 +23,7 @@ "cacheVariables": { "SLANG_SLANG_LLVM_FLAVOR": "DISABLE", "SLANG_ENABLE_SPLIT_DEBUG_INFO": "OFF", + "SLANG_ENABLE_SLANG_RHI": "OFF", "CMAKE_C_FLAGS_INIT": "-fwasm-exceptions -Os", "CMAKE_CXX_FLAGS_INIT": "-fwasm-exceptions -Os", "CMAKE_EXE_LINKER_FLAGS": "-sASSERTIONS -sALLOW_MEMORY_GROWTH -fwasm-exceptions --export=__cpp_exception" diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 446055a8b..2a9d3fee8 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -97,11 +97,11 @@ target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb") # slang-rhi if(SLANG_ENABLE_SLANG_RHI) + set(SLANG_RHI_BUILD_FROM_SLANG_REPO ON) set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin) + set(SLANG_RHI_FETCH_SLANG OFF) set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include) set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR}) - set(SLANG_RHI_BUILD_TESTS OFF) - set(SLANG_RHI_BUILD_EXAMPLES OFF) # Not disabling these break tests (issue #5474) set(SLANG_RHI_FETCH_DXC OFF) diff --git a/external/slang-rhi b/external/slang-rhi -Subproject 0cb0a6e777a39e9cf08720b413fe87570490f6a +Subproject cdca38d08fd3c16400b83cbbb23680ed644ec00 |