Skip to content

Commit 384fd27

Browse files
committed
fix examples 48, 62 and 64, update examples_tests submodule, update src/nbl/CMakeLists.txt
1 parent 6253ed9 commit 384fd27

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/nbl/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,10 @@ if(NBL_STATIC_BUILD)
467467
else()
468468
target_link_libraries(Nabla PRIVATE SPIRV SPIRV-Tools SPIRV-Tools-opt)
469469
endif()
470-
target_include_directories(Nabla PUBLIC BEFORE "${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Tools/include")
470+
target_include_directories(Nabla PUBLIC
471+
"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Tools/include"
472+
"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers/include"
473+
)
471474
# simdjson
472475
add_dependencies(Nabla simdjson)
473476
if(NBL_STATIC_BUILD)
@@ -500,6 +503,9 @@ if (_NBL_COMPILE_WITH_OPEN_EXR_)
500503
else()
501504
target_link_libraries(Nabla PRIVATE OpenEXR::IlmImf)
502505
endif()
506+
507+
target_link_libraries(Nabla INTERFACE Half) # a workaround which causes Half static library to be linked directly to each Nabla example no matter if Nabla is DLL or not, I think we should really not expose OpenEXR interface to our public Nabla include files
508+
503509
target_include_directories(
504510
Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/openexr/OpenEXR/IlmImf
505511
Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/openexr/IlmBase/Half

0 commit comments

Comments
 (0)