Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla

Author: devshgraphicsprogramming

3rdparty/boost/CMakeLists.txt

@@ -17,6 +17,60 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
     ADD_CUSTOM_BUILTIN_RESOURCES(boostBuiltinResourceData BOOST_RESOURCES_TO_EMBED "${_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_}" "boost" "boost::builtin" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "STATIC" "INTERNAL")
 endif()
 
-set(BOOST_INCLUDE_LIBRARIES wave)
+get_filename_component(NBL_BOOST_WAVE_DEP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dep/wave.cmake" ABSOLUTE)
+
+if(NOT EXISTS "${NBL_BOOST_WAVE_DEP_FILE}")
+	message(FATAL_ERROR "Internal error, generate NBL_BOOST_WAVE_DEP_FILE by enabling NBL_BOOST_GENERATE_DEP_LIST!")
+endif()
+
 set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
-add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
+include("${NBL_BOOST_WAVE_DEP_FILE}")
+
+foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
+	add_subdirectory(superproject/libs/${BOOST_LIB} EXCLUDE_FROM_ALL)
+endforeach()
+
+add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)
+
+# Boost uses it's own tool for generating dependency list for targets, therefore we 
+# can make sure manually added dependnecy subdirectories for a library are valid
+# https://www.boost.org/doc/libs/1_83_0/tools/boostdep/doc/html/index.html#boostdep.introduction.building_boostdep
+
+if(NBL_BOOST_GENERATE_DEP_LIST) # internal, for Nabla devs
+	if(WIN32)
+		set(NBL_BOOSTDEP_EXE "boostdep.exe")
+	else()
+		set(NBL_BOOSTDEP_EXE "boostdep")
+	endif()
+	
+	set(NBL_BOOSTDEP_EXE_FILEPATH "${CMAKE_CURRENT_BINARY_DIR}/superproject/tools/boostdep/bin/${NBL_BOOSTDEP_EXE}")
+	
+	if(NOT EXISTS "${NBL_BOOSTDEP_EXE_FILEPATH}")
+		macro(NBL_BOOST_EXECUTE)
+			execute_process(COMMAND ${ARGV}
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/superproject"
+			)
+		endmacro()
+
+		NBL_BOOST_EXECUTE(cmd /C bootstrap.bat)
+		NBL_BOOST_EXECUTE(cmd /C b2.exe tools/boostdep/build)
+		NBL_BOOST_EXECUTE("${CMAKE_COMMAND}" -E copy "./dist/bin/${NBL_BOOSTDEP_EXE}" "${NBL_BOOSTDEP_EXE_FILEPATH}")
+		NBL_BOOST_EXECUTE(git clean -fdx)
+		NBL_BOOST_EXECUTE(git reset --hard)
+	endif()
+
+	execute_process(COMMAND "${NBL_BOOSTDEP_EXE_FILEPATH}" --boost-root "${CMAKE_CURRENT_SOURCE_DIR}/superproject" --brief wave
+		OUTPUT_VARIABLE NBL_OUTPUT_VAR
+	)
+
+	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "${NBL_OUTPUT_VAR}")
+
+	file(STRINGS "${NBL_BOOST_WAVE_DEP_FILE}" NBL_BOOST_LIBS)
+	set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})
+	list(POP_FRONT NBL_BOOST_LIBS)
+	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "#")
+	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "(unknown)")
+	string(REPLACE "~" "/" NBL_BOOST_LIBS "${NBL_BOOST_LIBS}")
+
+	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})")
+endif()

3rdparty/boost/dep/wave.cmake

@@ -0,0 +1 @@
+set(NBL_BOOST_LIBS assert;concept_check;config;core;filesystem;format;iterator;lexical_cast;mpl;multi_index;optional;pool;preprocessor;serialization;smart_ptr;spirit;static_assert;throw_exception;type_traits;atomic;container_hash;detail;io;predef;system;winapi;utility;conversion;function_types;fusion;container;integer;numeric/conversion;bind;move;tuple;array;function;mp11;variant;variant2;endian;phoenix;proto;range;regex;thread;typeof;unordered;align;intrusive;describe;functional;chrono;date_time;exception;type_index;ratio;algorithm;tokenizer)

cmake/common.cmake

@@ -1277,11 +1277,17 @@ macro(write_source_definitions NBL_FILE NBL_WRAPPER_CODE_TO_WRITE)
 endmacro()
 
 function(NBL_UPDATE_SUBMODULES)
-	macro(NBL_WRAPPER_COMMAND GIT_RELATIVE_ENTRY GIT_SUBMODULE_PATH SHOULD_RECURSIVE)
+	macro(NBL_WRAPPER_COMMAND GIT_RELATIVE_ENTRY GIT_SUBMODULE_PATH SHOULD_RECURSIVE EXCLUDE_SUBMODULE_PATH)
 		set(SHOULD_RECURSIVE ${SHOULD_RECURSIVE})
-	
+		
+		if("${EXCLUDE_SUBMODULE_PATH}" STREQUAL "")
+			set(NBL_EXCLUDE "")
+		else()
+			set(NBL_EXCLUDE "-c submodule.\"${EXCLUDE_SUBMODULE_PATH}\".update=none")
+		endif()
+
 		if(SHOULD_RECURSIVE)
-			string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init --recursive ${GIT_SUBMODULE_PATH}\n")
+			string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" ${NBL_EXCLUDE} -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init --recursive ${GIT_SUBMODULE_PATH}\n")
 		else()
 			string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init ${GIT_SUBMODULE_PATH}\n")
 		endif()
@@ -1291,14 +1297,21 @@ function(NBL_UPDATE_SUBMODULES)
 		execute_process(COMMAND ${CMAKE_COMMAND} -E echo "All submodules are about to get updated and initialized in repository because NBL_UPDATE_GIT_SUBMODULE is turned ON!")
 		set(_NBL_UPDATE_SUBMODULES_CMD_NAME_ "nbl-update-submodules")
 		set(_NBL_UPDATE_SUBMODULES_CMD_FILE_ "${NBL_ROOT_PATH_BINARY}/${_NBL_UPDATE_SUBMODULES_CMD_NAME_}.cmd")
+
+		include("${THIRD_PARTY_SOURCE_DIR}/boost/dep/wave.cmake")
 
 		if(NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE)
-			NBL_WRAPPER_COMMAND("" "" TRUE)
+			NBL_WRAPPER_COMMAND("" "" TRUE "")
 		else()
-			NBL_WRAPPER_COMMAND("" ./3rdparty TRUE)
-			#NBL_WRAPPER_COMMAND("" ./ci TRUE) TODO: enable it once we merge Ditt, etc
-			NBL_WRAPPER_COMMAND("" ./examples_tests FALSE)
-			NBL_WRAPPER_COMMAND(examples_tests ./media FALSE)
+			NBL_WRAPPER_COMMAND("" ./3rdparty TRUE "3rdparty/boost/superproject")
+			NBL_WRAPPER_COMMAND(3rdparty/boost "./superproject" FALSE "")
+			foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
+				NBL_WRAPPER_COMMAND(3rdparty/boost/superproject "./libs/${BOOST_LIB}" TRUE "")
+			endforeach()
+
+			#NBL_WRAPPER_COMMAND("" ./ci TRUE "") TODO: enable it once we merge Ditt, etc
+			NBL_WRAPPER_COMMAND("" ./examples_tests FALSE "")
+			NBL_WRAPPER_COMMAND(examples_tests ./media FALSE "")
 		endif()
 
 		file(WRITE "${_NBL_UPDATE_SUBMODULES_CMD_FILE_}" "${_NBL_UPDATE_SUBMODULES_COMMANDS_}")