Merge remote-tracking branch 'remotes/origin/exBuiltinArchives'

Author: devsh

3rdparty/boost/CMakeLists.txt

@@ -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)

CMakeLists.txt

@@ -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)
@@ -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)

CMakePresets.json

@@ -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",