Skip to content

Commit 80724c9

Browse files
AnastaZIukdeprilula28
authored andcommitted
link dxcompiler library to Nabla
1 parent 8408e13 commit 80724c9

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

3rdparty/dxc/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ list(APPEND DXC_CMAKE_ARGS "-DCLANG_CL:BOOL=OFF")
3030
list(APPEND DXC_CMAKE_ARGS "-DCMAKE_SYSTEM_VERSION=10.0.17763.0")
3131
list(APPEND DXC_CMAKE_ARGS "-DDXC_BUILD_ARCH=x64")
3232

33-
set(DXC_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dxc" CACHE PATH "")
34-
set(DXC_BINARY_DIR_EP "${CMAKE_CURRENT_BINARY_DIR}/external/dxc" CACHE PATH "")
35-
set(DXC_BINARY_DIR_GE "${DXC_BINARY_DIR_EP}/Release" CACHE PATH "")
36-
set(DXC_BIN_DIR "${DXC_BINARY_DIR_GE}/Release/bin" CACHE PATH "")
37-
set(DXC_EXECUTABLE "${DXC_BIN_DIR}/dxc.exe" CACHE FILEPATH "")
33+
set(DXC_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dxc" CACHE INTERNAL "")
34+
set(DXC_BINARY_DIR_EP "${CMAKE_CURRENT_BINARY_DIR}/external/dxc" CACHE INTERNAL "")
35+
set(DXC_BINARY_DIR_GE "${DXC_BINARY_DIR_EP}/Release" CACHE INTERNAL "")
36+
set(DXC_BIN_DIR "${DXC_BINARY_DIR_GE}/Release/bin" CACHE INTERNAL "")
37+
set(DXC_LIB_DIR "${DXC_BINARY_DIR_GE}/Release/lib" CACHE INTERNAL "")
38+
set(DXC_EXECUTABLE "${DXC_BIN_DIR}/dxc.exe" CACHE INTERNAL "")
39+
set(DXC_DXCOMPILER_LIB "${DXC_LIB_DIR}/dxcompiler.lib" CACHE INTERNAL "")
3840

3941
ExternalProject_Add(dxc
4042
DOWNLOAD_COMMAND ""

src/nbl/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,18 @@ endif()
582582
# DXC
583583
if(_NBL_COMPILE_WITH_DXC_)
584584
add_dependencies(Nabla dxc)
585+
target_include_directories(Nabla PRIVATE
586+
"${DXC_BINARY_DIR_GE}/tools/clang/tools/dxcompiler"
587+
"${DXC_SOURCE_DIR}/tools/clang/tools/dxcompiler"
588+
"${DXC_SOURCE_DIR}/tools/clang/include"
589+
"${DXC_BINARY_DIR_GE}/tools/clang/include"
590+
"${DXC_SOURCE_DIR}/include/llvm/llvm_assert"
591+
"${DXC_BINARY_DIR_GE}/include"
592+
"${DXC_SOURCE_DIR}/include"
593+
"${DXC_BINARY_DIR_GE}/include/dxc/Tracing"
594+
"${DXC_BINARY_DIR_GE}/utils/version"
595+
)
596+
target_link_libraries(Nabla INTERFACE "${DXC_DXCOMPILER_LIB}")
585597

586598
############################################################################
587599
# list files you want to compile with DXC in _NBL_ENABLE_DXC_COMPILE_TESTS_

0 commit comments

Comments
 (0)