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

Author: Hazardu

.gitignore

@@ -33,3 +33,5 @@ tools/nsc/__main__.py
 tools/nsc/.vscode/*
 tools/nsc/.profiles/*
 tools/nsc/bin/*
+*/__pycache__/*
+__pycache__/*

3rdparty/CMakeLists.txt

@@ -62,9 +62,15 @@ set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_SKIP_INSTALL_ALL ${SKIP_INSTALL_ALL})
 set(BUILD_SHARED_LIBS OFF)
 set(SKIP_INSTALL_ALL ON)
+
 add_subdirectory(zlib zlib EXCLUDE_FROM_ALL)
-execute_process(COMMAND ${CMAKE_COMMAND} -E rename zconf.h.included zconf.h 
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zlib") # clean zlib git working-tree
+file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/zlib" DIRECTORY GUARD PROCESS RESULT_VARIABLE NBL_LOCK TIMEOUT 60)
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included")
+	execute_process(COMMAND "${CMAKE_COMMAND}" -E rename zconf.h.included zconf.h 
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
+	) # clean zlib git working-tree
+endif()
+file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/zlib" DIRECTORY RELEASE RESULT_VARIABLE NBL_LOCK)
 set(SKIP_INSTALL_ALL ${_OLD_SKIP_INSTALL_ALL})
 set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 

3rdparty/dxc/CMakeLists.txt

@@ -97,42 +97,6 @@ endif()
 set(CMAKE_CXX_STANDARD 20) # it's mandatory
 unset(CMAKE_CXX_STANDARD_REQUIRED)
 
-include(FetchContent)
-set(FC_EXTERNAL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/external")
-
-set(DXC_BINARY_DIR "${FC_EXTERNAL_BINARY_DIR}/dxc" CACHE INTERNAL "")
-set(DXC_DOWNLOAD_DIR "${DXC_BINARY_DIR}/download" CACHE INTERNAL "")
-set(DXC_UNPACK_DIR "${DXC_BINARY_DIR}/unpack" CACHE INTERNAL "")
-
-FetchContent_Declare(
-	FC_DXC
-	URL 			  "${CMAKE_CURRENT_SOURCE_DIR}/exe/bin.tar.bz2"
-	DOWNLOAD_DIR      "${DXC_DOWNLOAD_DIR}"
-	SOURCE_DIR		  "${DXC_UNPACK_DIR}"
-	BINARY_DIR        "${DXC_BINARY_DIR}"
-)
-
-if(NOT DEFINED FC_DXC_POPULATED OR NOT ${FC_DXC_POPULATED})
-	message(STATUS "Populating DXC executable...")
-	
-	FetchContent_MakeAvailable(FC_DXC)
-	FetchContent_GetProperties(FC_DXC POPULATED _FC_DXC_POPULATED_)
-	
-	if(${_FC_DXC_POPULATED_})
-		set(FC_DXC_POPULATED ON CACHE INTERNAL "")
-	else()
-		set(FC_DXC_POPULATED OFF CACHE INTERNAL "")
-	endif()
-	
-	unset(_FC_DXC_POPULATED_)
-endif()
-
-set(DXC_EXT_EXECUTABLE "${DXC_UNPACK_DIR}/dxc.exe" CACHE STRING "" FORCE)
-
-if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
-	add_subdirectory(CT CT)
-endif()
-
 include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
 include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
 

3rdparty/dxc/CT/CMakeLists.txt

@@ -312,7 +312,7 @@ option(NBL_BUILD_EXAMPLES "Enable building examples" ON)
 
 option(NBL_BUILD_MITSUBA_LOADER "Enable nbl::ext::MitsubaLoader?" OFF) # TODO: once it compies turn this ON by default!
 
-option(NBL_BUILD_IMGUI "Enable nbl::ext::ImGui?" ON)
+option(NBL_BUILD_IMGUI "Enable nbl::ext::ImGui?" OFF)
 
 option(NBL_BUILD_OPTIX "Enable nbl::ext::OptiX?" OFF)
 if(NBL_COMPILE_WITH_CUDA)
@@ -336,24 +336,19 @@ set(THIRD_PARTY_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty")
 
 set(NBL_MEDIA_DIRECTORY "${PROJECT_SOURCE_DIR}/examples_tests/media")
 get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE)
-				
-option(NBL_UPDATE_GIT_SUBMODULE "Turn this ON to let CMake update all public submodules for you" ON)
-option(NBL_FORCE_ON_UPDATE_GIT_SUBMODULE "Submodules will be updated with --force flag if NBL_FORCE_UPDATE_GIT_SUBMODULE is turned ON, use with caution - if there are any uncommited files in submodules' working tree they will be removed!" OFF)
-option(NBL_SYNC_ON_UPDATE_GIT_SUBMODULE "Sync initialized submodule paths if NBL_FORCE_UPDATE_GIT_SUBMODULE is turned ON, this is useful when any submodule remote path got modified and you want to apply this modification to your local repository. Turning NBL_FORCE_ON_UPDATE_GIT_SUBMODULE implies this option" OFF)
-option(NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE "Turn this ON to attempt to update private Nabla submodules" OFF)
-option(NBL_CI_GIT_SUBMODULES_SHALLOW "" OFF)
-
-find_package(Git REQUIRED)
+
+include(submodules/update)
 find_package (Python3 COMPONENTS Interpreter REQUIRED)
 include(common)
 
-NBL_UPDATE_SUBMODULES()
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 
 add_subdirectory(src/nbl)
 add_subdirectory("${NBL_PYTHON_MODULE_ROOT_PATH}" tests) # Python Framework
 if(NBL_BUILD_EXAMPLES)
+	file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/examples_tests" DIRECTORY GUARD PROCESS RESULT_VARIABLE NBL_LOCK TIMEOUT 60)
 	add_subdirectory(examples_tests)
+	file(LOCK "${CMAKE_CURRENT_SOURCE_DIR}/examples_tests" DIRECTORY RELEASE RESULT_VARIABLE NBL_LOCK)
 endif()
 add_subdirectory(tools)