diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2025-06-06 16:39:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-06 16:39:14 +0200 |
| commit | 8abaec701f0637f082e081caa0dd4fa049a00430 (patch) | |
| tree | 79cb7d6257ecd4fe4f2ace21068d934fd9cff553 /cmake | |
| parent | 4cfc0f1fd67499847f2fa745cd083ebf0edd8188 (diff) | |
Update slang-rhi (#7303)
* update slang-rhi
* adapt to new slang-rhi API
* enable slang-rhi agility sdk
* fix handling empty list
* disable failing slang-rhi tests
* format code
* fix slang-rhi-tests ci step
* skip running slang-rhi-tests
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/LLVM.cmake | 13 | ||||
| -rw-r--r-- | cmake/SlangTarget.cmake | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake index a72cae0f5..d707d3605 100644 --- a/cmake/LLVM.cmake +++ b/cmake/LLVM.cmake @@ -111,16 +111,10 @@ function(fetch_or_build_slang_llvm) if(SLANG_ENABLE_PREBUILT_BINARIES) if(CMAKE_SYSTEM_NAME MATCHES "Windows") - # DX Agility SDK requires the D3D12*.DLL files to be placed under a sub-directory, "D3D12". - # https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#d3d12sdkpath-should-not-be-the-same-directory-as-the-application-exe file( GLOB prebuilt_binaries "${slang_SOURCE_DIR}/external/slang-binaries/bin/windows-x64/*" ) - file( - GLOB prebuilt_d3d12_binaries - "${slang_SOURCE_DIR}/external/slang-binaries/bin/windows-x64/[dD]3[dD]12*" - ) list(REMOVE_ITEM prebuilt_binaries ${prebuilt_d3d12_binaries}) add_custom_target( copy-prebuilt-binaries @@ -131,13 +125,6 @@ function(fetch_or_build_slang_llvm) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${prebuilt_binaries} ${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir} - COMMAND - ${CMAKE_COMMAND} -E make_directory - ${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir}/D3D12 - COMMAND - ${CMAKE_COMMAND} -E copy_if_different - ${prebuilt_d3d12_binaries} - ${CMAKE_BINARY_DIR}/$<CONFIG>/${runtime_subdir}/D3D12 VERBATIM ) set_target_properties( diff --git a/cmake/SlangTarget.cmake b/cmake/SlangTarget.cmake index cadd33ac0..e9fde3ebf 100644 --- a/cmake/SlangTarget.cmake +++ b/cmake/SlangTarget.cmake @@ -430,14 +430,14 @@ function(slang_add_target dir type) target_include_directories( ${target} PRIVATE - $<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES> + $<$<BOOL:${include_from}>:$<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>> ) endforeach() foreach(include_from ${ARG_INCLUDE_FROM_PUBLIC}) target_include_directories( ${target} PUBLIC - $<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES> + $<$<BOOL:${include_from}>:$<TARGET_PROPERTY:${include_from},INTERFACE_INCLUDE_DIRECTORIES>> ) endforeach() |