Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build error when SLANG_ENABLE_TESTS is set to OFF #6420

Merged
merged 8 commits into from
Feb 28, 2025
Merged

Fix build error when SLANG_ENABLE_TESTS is set to OFF #6420

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
265f350
Fix build error when SLANG_ENABLE_TESTS is set to OFF
jkwak-work Feb 21, 2025
f5ce3a0
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
jkwak-work Feb 22, 2025
ee28133
format code (#42)
slangbot Feb 22, 2025
ee4bba2
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
jkwak-work Feb 24, 2025
ffb0cfe
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
jkwak-work Feb 24, 2025
2cbb1af
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
expipiplus1 Feb 24, 2025
61645c4
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
jkwak-work Feb 25, 2025
59795c0
Merge branch 'master' into fix/SLANG_ENABLE_TEST_cannot_be_disabled_w…
jkwak-work Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,29 +156,35 @@ if(SLANG_ENABLE_GFX)
${slang_SOURCE_DIR}
${slang_SOURCE_DIR}/include
INCLUDE_DIRECTORIES_PRIVATE ${NVAPI_INCLUDE_DIRS}
REQUIRES copy-gfx-slang-modules
INSTALL
EXPORT_SET_NAME SlangTargets
FOLDER gfx
)
set(modules_dest_dir $<TARGET_FILE_DIR:slang-test>)
add_custom_target(
copy-gfx-slang-modules
COMMAND ${CMAKE_COMMAND} -E make_directory ${modules_dest_dir}
COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/gfx/gfx.slang
${modules_dest_dir}/gfx.slang
COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/gfx/slang.slang
${modules_dest_dir}/slang.slang
WORKING_DIRECTORY ${slang_SOURCE_DIR}
VERBATIM
)
set_target_properties(copy-gfx-slang-modules PROPERTIES FOLDER generators)
install(
FILES ${modules_dest_dir}/gfx.slang ${modules_dest_dir}/slang.slang
DESTINATION ${runtime_subdir}
)
if(SLANG_ENABLE_TESTS)
set(modules_dest_dir $<TARGET_FILE_DIR:slang-test>)
add_custom_target(
copy-gfx-slang-modules
COMMAND ${CMAKE_COMMAND} -E make_directory ${modules_dest_dir}
COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/gfx/gfx.slang
${modules_dest_dir}/gfx.slang
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_LIST_DIR}/gfx/slang.slang
${modules_dest_dir}/slang.slang
WORKING_DIRECTORY ${slang_SOURCE_DIR}
VERBATIM
)
set_target_properties(
copy-gfx-slang-modules
PROPERTIES FOLDER generators
)
install(
FILES ${modules_dest_dir}/gfx.slang ${modules_dest_dir}/slang.slang
DESTINATION ${runtime_subdir}
)
add_dependencies(gfx copy-gfx-slang-modules)
endif()

slang_add_target(
gfx-util
Expand Down
Loading