Merge branch 'master' into cad-text-rendering-mip-maps

Author: Erfan-Ahmadi

.gitmodules

@@ -72,7 +72,7 @@
 	url = git@github.com:Devsh-Graphics-Programming/Nabla-Examples-and-Tests.git
 [submodule "3rdparty/msdfgen"]
 	path = 3rdparty/msdfgen
-	url = https://github.com/Chlumsky/msdfgen
+	url = git@github.com:Chlumsky/msdfgen.git
 	branch = master
 [submodule "3rdparty/dxc/dxc"]
 	path = 3rdparty/dxc/dxc
@@ -95,10 +95,19 @@
 	url = git@github.com:p-ranav/argparse.git
 [submodule "3rdparty/nlohmann_json"]
 	path = 3rdparty/nlohmann_json
-	url = https://github.com/Devsh-Graphics-Programming/json
+	url = git@github.com:Devsh-Graphics-Programming/json.git
 [submodule "3rdparty/blake"]
 	path = 3rdparty/blake
 	url = git@github.com:Devsh-Graphics-Programming/BLAKE3.git
 [submodule "3rdparty/imguizmo"]
 	path = 3rdparty/imguizmo
 	url = git@github.com:Devsh-Graphics-Programming/ImGuizmo.git
+[submodule "3rdparty/git-version-tracking"]
+	path = 3rdparty/git-version-tracking
+	url = git@github.com:Devsh-Graphics-Programming/cmake-git-version-tracking.git
+[submodule "3rdparty/imath"]
+	path = 3rdparty/imath
+	url = git@github.com:AcademySoftwareFoundation/Imath.git
+[submodule "3rdparty/libdeflate"]
+	path = 3rdparty/libdeflate
+	url = git@github.com:Devsh-Graphics-Programming/libdeflate.git

3rdparty/CMakeLists.txt

@@ -193,35 +193,48 @@ option(PNG_TESTS  "Build libpng tests" OFF)
 add_subdirectory(libpng libpng EXCLUDE_FROM_ALL)
 add_dependencies(png_static zlibstatic)
 
-
 # OpenEXR
 option(_NBL_COMPILE_WITH_OPEN_EXR_ "Build with OpenEXR library" ON)
 
-# Note we are adding it anyway regardless _NBL_COMPILE_WITH_OPEN_EXR_, its because we need Half dependecy 
-# it generates on fly in its build directory which doesnt have to be linked (class with inline methods), 
-# here is where _NBL_COMPILE_WITH_OPEN_EXR_ plays a role - when disabled OpenEXR won't be built and linked
-# but it's core 
+# Imath
+set(IMATH_INSTALL OFF)
+add_subdirectory(imath EXCLUDE_FROM_ALL)
+
+if(_NBL_COMPILE_WITH_OPEN_EXR_)
+	# Deflate
+	set(LIBDEFLATE_BUILD_SHARED_LIB OFF)
+	set(LIBDEFLATE_BUILD_STATIC_LIB ON)
+	set(LIBDEFLATE_GZIP_SUPPORT OFF)
+	set(LIBDEFLATE_BUILD_GZIP OFF)
+	add_subdirectory(libdeflate EXCLUDE_FROM_ALL)
+	set(libdeflate_DIR "${CMAKE_CURRENT_BINARY_DIR}/libdeflate")
+
+	# OpenEXR
+	set(OPENEXR_FORCE_INTERNAL_DEFLATE ON) # trick it into thinking its internal
+	set(EXR_DEFLATE_LIB libdeflate_static) # and pass deflate target directly from our build tree
+	set(OPENEXR_FORCE_INTERNAL_IMATH ON) # similar case, force it to look into target from build tree
+	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+	set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
+	set(_OLD_BUILD_TESTING ${BUILD_TESTING})
+	set(BUILD_SHARED_LIBS OFF)
+	set(BUILD_STATIC_LIBS OFF)
+	set(BUILD_TESTING OFF)
+	set(PYILMBASE_ENABLE OFF)
+	set(OPENEXR_BUILD_UTILS OFF)
+	set(OPENEXR_BUILD_TOOLS OFF)
+	set(OPENEXR_INSTALL OFF)
+	set(OPENEXR_INSTALL_DOCS OFF)
+	set(OPENEXR_INSTALL_EXAMPLES OFF)
+	set(OPENEXR_INSTALL_PKG_CONFIG OFF)
+	set(OPENEXR_INSTALL_TOOLS OFF)
+	add_subdirectory(openexr EXCLUDE_FROM_ALL)
+	set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
+	set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
+	set(BUILD_TESTING ${_OLD_BUILD_TESTING})
+endif()
+
+
 
-set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
-set(_OLD_BUILD_TESTING ${BUILD_TESTING})
-set(BUILD_SHARED_LIBS OFF)
-set(BUILD_STATIC_LIBS OFF)
-set(BUILD_TESTING OFF)
-set(PYILMBASE_ENABLE OFF CACHE STRING "" FORCE)
-set(OPENEXR_BUILD_UTILS OFF CACHE STRING "" FORCE)
-set(OPENEXR_FORCE_INTERNAL_IMATH ON CACHE STRING "" FORCE) # TODO: make it a submodule and force using it maybe instead of letting OpenEXR download it from it's github repository
-set(OPENEXR_BUILD_TOOLS OFF CACHE STRING "" FORCE) 
-set(OPENEXR_INSTALL OFF CACHE STRING "" FORCE)
-set(OPENEXR_INSTALL_DOCS OFF CACHE STRING "" FORCE)
-set(OPENEXR_INSTALL_EXAMPLES OFF CACHE STRING "" FORCE)
-set(OPENEXR_INSTALL_PKG_CONFIG OFF CACHE STRING "" FORCE)
-set(OPENEXR_INSTALL_TOOLS OFF CACHE STRING "" FORCE)
-
-add_subdirectory(openexr openexr EXCLUDE_FROM_ALL)
-set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
-set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
-set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 
 #gli
 option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
@@ -275,6 +288,12 @@ add_library(spirv_cross OBJECT
 )
 target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
+# cmake-git-version-tracking
+add_subdirectory(git-version-tracking EXCLUDE_FROM_ALL)
+NBL_ADD_GIT_TRACKING_META_LIBRARY(nabla "${NBL_ROOT_PATH}")
+NBL_ADD_GIT_TRACKING_META_LIBRARY(dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc")
+NBL_GENERATE_GIT_TRACKING_META()
+
 if(NBL_BUILD_IMGUI)
 	add_library(imgui STATIC
 		"imgui/imconfig.h"
@@ -391,10 +410,6 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
 				SPIRV-Tools-opt
-				OpenEXRUtil
-				OpenEXRCore
-				Iex
-				IlmThread
 				Imath
 				freetype
 				${NBL_MSDFGEN_TARGETS}
@@ -403,7 +418,7 @@ set(NBL_3RDPARTY_TARGETS
 )
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
 	list(APPEND NBL_3RDPARTY_TARGETS
-		OpenEXR
+		OpenEXR libdeflate_static OpenEXRUtil OpenEXRCore Iex IlmThread
 	)
 endif()
 

3rdparty/dxc/dxc

@@ -151,12 +151,12 @@ git clone git@github.com:Devsh-Graphics-Programming/Nabla.git <target directory>
 
 #### Force HTTPS protocol (optional)
 
-We support cloning Nabla with **ssh only**, however you can still force clone with https for whole repository and it's all submodules by overriding project git config setup.
+We support cloning Nabla with **ssh only**, however you can still clone Nabla and it's all submodules with https by overriding global git configuration (sorry, must be global for it to work, currently we don't have smart scripts to change local configuration for each nested submodule).
 
 ```powershell
 git init
-git config --project protocol.*.allow always
-git config --project url."https://github.com/".insteadOf "git@github.com:"
+git config --global protocol.*.allow always
+git config --global url."https://github.com/".insteadOf "git@github.com:"
 git remote add origin https://github.com/Devsh-Graphics-Programming/Nabla.git
 git fetch origin master
 git checkout master