diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-11-14 12:34:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-13 20:34:18 -0800 |
| commit | 7b570feed42976a6e787d79a70aaf8e667745e58 (patch) | |
| tree | 7f96139f9570de1e2c5747faf6ad489e029de535 /tools/CMakeLists.txt | |
| parent | fdf106b543c756eebca7e90fe839fdf1902cc381 (diff) | |
Correct include dir for libslang (#5539)
This stops adding the repo root to the include path for anything linking
with slang. This enabled a bunch of convenient includes, but might lead
to confusing behavior for anyone including slang. Not to mention
differences including it from an install vs source.
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/CMakeLists.txt')
| -rw-r--r-- | tools/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 2593a60fd..8438fe6b8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -98,6 +98,7 @@ if(SLANG_ENABLE_GFX) LINK_WITH_PRIVATE core imgui + stb $<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11> "$<$<PLATFORM_ID:Darwin>:-framework Cocoa>" "$<$<PLATFORM_ID:Darwin>:-framework QuartzCore>" @@ -106,7 +107,7 @@ if(SLANG_ENABLE_GFX) EXTRA_COMPILE_DEFINITIONS_PRIVATE $<$<BOOL:${SLANG_ENABLE_XLIB}>:SLANG_ENABLE_XLIB=1> INCLUDE_FROM_PRIVATE gfx - INCLUDE_DIRECTORIES_PUBLIC platform + INCLUDE_DIRECTORIES_PUBLIC . platform EXPORT_MACRO_PREFIX SLANG_PLATFORM ) @@ -122,6 +123,7 @@ if(SLANG_ENABLE_GFX) slang Vulkan-Headers metal-cpp + stb $<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11> $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver> LINK_WITH_FRAMEWORK Foundation Cocoa QuartzCore Metal @@ -182,6 +184,7 @@ if(SLANG_ENABLE_TESTS) EXECUTABLE EXCLUDE_FROM_ALL LINK_WITH_PRIVATE core compiler-core slang + INCLUDE_FROM_PRIVATE unit-test FOLDER test ) slang_add_target( @@ -196,10 +199,12 @@ if(SLANG_ENABLE_TESTS) slang-test EXECUTABLE USE_FEWER_WARNINGS + INCLUDE_DIRECTORIES_PUBLIC . LINK_WITH_PRIVATE core compiler-core slang + stb ${CMAKE_DL_LIBS} Threads::Threads REQUIRES @@ -241,6 +246,7 @@ if(SLANG_ENABLE_TESTS) unit-test OBJECT EXCLUDE_FROM_ALL + INCLUDE_DIRECTORIES_PUBLIC . INCLUDE_FROM_PRIVATE slang core INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/include FOLDER test @@ -254,7 +260,7 @@ if(SLANG_ENABLE_TESTS) EXCLUDE_FROM_ALL EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_SHARED_LIBRARY_TOOL USE_FEWER_WARNINGS - LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform + LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform stb OUTPUT_NAME gfx-unit-test-tool REQUIRED_BY slang-test FOLDER test/tools @@ -272,6 +278,7 @@ if(SLANG_ENABLE_TESTS) slang slang-rhi platform + stb $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver> EXTRA_COMPILE_DEFINITIONS_PRIVATE $<$<BOOL:${SLANG_ENABLE_CUDA}>:RENDER_TEST_CUDA> |