Skip to content

Commit edfa177

Browse files
committed
Default to package NSC mode
1 parent 465b4a4 commit edfa177

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

CMakePresets.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"cacheVariables": {
1313
"CMAKE_SUPPRESS_REGENERATION": "ON",
1414
"NBL_EMBED_BUILTIN_RESOURCES": "ON",
15+
"NBL_NSC_MODE": "SOURCE",
1516
"NBL_UPDATE_GIT_SUBMODULE": "OFF",
1617
"NBL_COMPILE_WITH_CUDA": "OFF",
1718
"NBL_BUILD_OPTIX": "OFF",

cmake/common.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,11 +1566,18 @@ namespace @IMPL_NAMESPACE@ {
15661566
list(APPEND NBL_NSC_BYPRODUCTS "${DEPFILE_PATH}")
15671567
endif()
15681568

1569+
set(NBL_NSC_CUSTOM_DEPENDS
1570+
${DEPENDS_ON}
1571+
Nabla::nsc
1572+
$<TARGET_NAME_IF_EXISTS:DeviceHeaders>
1573+
)
1574+
list(REMOVE_DUPLICATES NBL_NSC_CUSTOM_DEPENDS)
1575+
15691576
set(NBL_NSC_CUSTOM_COMMAND_ARGS
15701577
OUTPUT "${TARGET_OUTPUT}"
15711578
BYPRODUCTS ${NBL_NSC_BYPRODUCTS}
15721579
COMMAND ${NBL_NSC_COMPILE_COMMAND}
1573-
DEPENDS ${DEPENDS_ON} Nabla::nsc
1580+
DEPENDS ${NBL_NSC_CUSTOM_DEPENDS}
15741581
COMMENT "${NBL_NSC_CONFIG_NAME} (${NBL_NSC_INPUT_NAME})"
15751582
VERBATIM
15761583
COMMAND_EXPAND_LISTS

tools/nsc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(NBL_NSC_MODE "SOURCE" CACHE STRING "How to provide the nsc build tool. Valid values: SOURCE and PACKAGE")
1+
set(NBL_NSC_MODE "PACKAGE" CACHE STRING "How to provide the nsc build tool. Valid values: SOURCE and PACKAGE")
22
set_property(CACHE NBL_NSC_MODE PROPERTY STRINGS SOURCE PACKAGE)
33
set(NBL_NSC_PACKAGE_ROOT "" CACHE PATH "Path to an unpacked Nabla package root that exposes COMPONENTS NSC")
44
set(NBL_NSC_MANIFEST_ROOT "" CACHE PATH "Path to the local nsc manifest root. Defaults to tools/nsc/manifests.")

0 commit comments

Comments
 (0)