Skip to content

Ex builtin archives #896

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

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Ex builtin archives #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d6fc177
prefix example targets with numbers and do not make them C identifier…
AnastaZIuk Jun 23, 2025
055aa5d
correct NBL_ADJUST_FOLDERS and update references
AnastaZIuk Jun 25, 2025
f18bf0c
create NBL_REGISTER_SPIRV_SHADERS, update examples_tests submodule
AnastaZIuk Jun 25, 2025
0477e5f
move NBL_REGISTER_SPIRV_SHADERS to cmake/common.cmake, update example…
AnastaZIuk Jun 25, 2025
7b44d31
make NBL_REGISTER_SPIRV_SHADERS work in mount mode, update NSC compil…
AnastaZIuk Jun 27, 2025
3718dfc
fix issues with wave config causing ABI mismatch, add new NBL_WAVE_ST…
AnastaZIuk Jun 29, 2025
439177e
save plan & thoughts in comments
AnastaZIuk Jun 30, 2025
d7eca2b
pull master, resolve conflicts
AnastaZIuk Jul 2, 2025
3e8e08d
pull master & resolve conflicts
AnastaZIuk Jul 3, 2025
09ec4b4
rename NBL_REGISTER_SPIRV_SHADERS to NBL_REGISTER_BUILD_MOUNT_POINT, …
AnastaZIuk Jul 3, 2025
b8c2ca1
handle DEPENDS in NBL_REGISTER_BUILD_MOUNT_POINT, update examples_tests
AnastaZIuk Jul 3, 2025
bed4f09
move targetSpirvVersion from SCompilerOptions to SPreprocessorOptions…
AnastaZIuk Jul 3, 2025
6dec863
refactor SPIRV tool, split into 2 functions, have meta lists, separat…
AnastaZIuk Jul 6, 2025
172d9b3
update SPIRV tool, add KEY json field and update examples_tests submo…
AnastaZIuk Jul 7, 2025
768b7cf
more properties, validation, logs and args for NBL_CREATE_NSC_COMPILE…
AnastaZIuk Jul 10, 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
18 changes: 16 additions & 2 deletions 3rdparty/boost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,25 @@ add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)

list(APPEND NBL_BOOST_TARGETS boost_wave) # wave
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
if(TARGET boost_${BOOST_LIB}) # wave's deps
list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
set(lib boost_${BOOST_LIB})
if(TARGET ${lib}) # wave's deps
list(APPEND NBL_BOOST_TARGETS ${lib})
endif()
endforeach()

# NOTE: wave *must* be compiled with config definitions, inserting them just before wave
# include will lead to ABI mismatch hence we update the target and let inherit options
target_compile_definitions(boost_wave
PUBLIC BOOST_WAVE_ENABLE_COMMANDLINE_MACROS=1
PUBLIC BOOST_WAVE_SUPPORT_PRAGMA_ONCE=0
PUBLIC BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES=1
PUBLIC BOOST_WAVE_SERIALIZATION=0
PUBLIC BOOST_WAVE_SUPPORT_INCLUDE_NEXT=0

# threading option: https://github.com/boostorg/wave/issues/237#issuecomment-2710251773
PUBLIC BOOST_WAVE_SUPPORT_THREADING=0
)

set(NBL_BOOST_TARGETS
${NBL_BOOST_TARGETS}
PARENT_SCOPE)
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ endif()
option(NBL_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
option(NBL_BUILD_DOCS "Enable building documentation?" OFF) # No one has doxygen installed, plus we dont know when was the last time we generated working doxy and we'll use SphinX in the future
option(NBL_ENABLE_PROJECT_JSON_CONFIG_VALIDATION "" ON)
option(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
option(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" OFF)
option(NBL_ENABLE_DOCKER_INTEGRATION "Enables docker integration, if client is not found Docker Desktop will be installed" OFF)

if (NBL_ENABLE_DOCKER_INTEGRATION)
Expand Down Expand Up @@ -285,4 +285,5 @@ add_subdirectory(artifacts)
option(NBL_CPACK_INCLUDE_EXAMPLES "CPack with examples and media" ON)
include(cpack/package)
include(build/info)
export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
NBL_ADJUST_FOLDERS(nabla)
1 change: 1 addition & 0 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"name": "ci-configure-base",
"hidden": true,
"cacheVariables": {
"NBL_EMBED_BUILTIN_RESOURCES": "ON",
"NBL_UPDATE_GIT_SUBMODULE": "OFF",
"NBL_COMPILE_WITH_CUDA": "OFF",
"NBL_BUILD_OPTIX": "OFF",
Expand Down
Loading
Loading