build: Add ClangCL profiles

.gitmodules

@@ -27,9 +27,6 @@
 	path = 3rdparty/libexpat
 	url = git@github.com:Devsh-Graphics-Programming/libexpat.git
 	branch = master
-[submodule "3rdparty/glm"]
-	path = 3rdparty/glm
-	url = git@github.com:AnastaZIuk/glm.git
 [submodule "3rdparty/freetype2"]
 	path = 3rdparty/freetype2
 	url = git@github.com:Devsh-Graphics-Programming/freetype.git
@@ -117,3 +114,6 @@
 [submodule "docker/compiler-explorer"]
 	path = docker/compiler-explorer
 	url = git@github.com:Devsh-Graphics-Programming/Compiler-Explorer-Docker.git
+[submodule "3rdparty/glm"]
+	path = 3rdparty/glm
+	url = git@github.com:Devsh-Graphics-Programming/glm.git

3rdparty/CMakeLists.txt

@@ -231,7 +231,7 @@ if(_NBL_COMPILE_WITH_OPEN_EXR_)
 endif()
 
 
-#gli
+# gli
 option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
 if(_NBL_COMPILE_WITH_GLI_)
 	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
@@ -240,12 +240,23 @@ if(_NBL_COMPILE_WITH_GLI_)
 	set(BUILD_SHARED_LIBS OFF)
 	set(BUILD_STATIC_LIBS OFF)
 	set(BUILD_TESTING OFF)
+	set(GLI_GLM_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/glm")
 	add_subdirectory(gli gli 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(ENABLE_STATIC_LIB ON)
+set(ENABLE_SHARED_LIB OFF)
+set(ENABLE_EXAMPLES OFF)
+set(ENABLE_DOCS OFF)
+set(ENABLE_APP OFF)
+set(ENABLE_LIB_ONLY ON)
+set(ENABLE_TESTS OFF)
+set(ENABLE_SUMMARY OFF)
+add_subdirectory(bzip2 bzip2 EXCLUDE_FROM_ALL)
+
 add_library(lzma OBJECT
 	lzma/C/Alloc.c
 	lzma/C/LzFind.c
@@ -262,17 +273,6 @@ add_library(lz4 OBJECT
 	lz4/lib/xxhash.c
 )
 
-
-add_library(bzip2 OBJECT
-	bzip2/blocksort.c
-	bzip2/bzlib.c
-	bzip2/compress.c
-	bzip2/crctable.c
-	bzip2/decompress.c
-	bzip2/huffman.c
-	bzip2/randtable.c
-)
-
 add_library(spirv_cross OBJECT
 	nbl_spirv_cross/spirv_cfg.cpp
 	nbl_spirv_cross/spirv_cross.cpp
@@ -419,12 +419,6 @@ add_library(aesGladman OBJECT
 
 add_subdirectory(argparse argparse EXCLUDE_FROM_ALL)
 
-option(GLM_TEST_ENABLE_SIMD_SSE4_2 "Enable SSE 4.2 optimizations" ON)
-option(GLM_TEST_ENABLE "Build unit tests" OFF)
-#add_subdirectory(glm EXCLUDE_FROM_ALL)
-set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
-set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
-
 if (NBL_BUILD_MITSUBA_LOADER)
    option(BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF)
    option(BUILD_examples "EXPAT: build the examples for expat library" OFF)
@@ -465,7 +459,7 @@ set(NBL_3RDPARTY_TARGETS
 				shaderc_util
 				shaderc
 				jpeg-static
-				bzip2
+				bz2_static
 				simdjson
 				nlohmann_json
 				glslang
@@ -496,11 +490,7 @@ if (NBL_BUILD_IMGUI)
 endif()
 
 foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
-		if(NBL_DYNAMIC_MSVC_RUNTIME)
-			set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-		else()
-			set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-		endif()
+		set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${NBL_COMPILER_DYNAMIC_RUNTIME}>:DLL>")
 
 		if(MSVC AND NBL_SANITIZE_ADDRESS)
 			set_property(TARGET ${trgt} PROPERTY COMPILE_OPTIONS /fsanitize=address)

3rdparty/dxc/CMakeLists.txt

@@ -63,11 +63,7 @@ if(WIN32)
 	endif()
 endif()
 
-if(NBL_DYNAMIC_MSVC_RUNTIME)
-	list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-else()
-	list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>")		
-endif()
+list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${NBL_COMPILER_DYNAMIC_RUNTIME}>:DLL>")
 
 # perform DXC compile standard requirement test
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

CMakeLists.txt

@@ -2,8 +2,13 @@
 # This file is part of the "Nabla Engine".
 # For conditions of distribution and use, see copyright notice in nabla.h.in or nabla.h
 
-cmake_minimum_required(VERSION 3.29)
-cmake_policy(SET CMP0112 NEW)
+cmake_minimum_required(VERSION 3.31)
+# TODO: Yas - once we deploy 4.x we will fire `cmake_policy` instead of manually picking policies
+# https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html#policy-version
+# also we should update deps which throw warnings about < 3.10 compatibility
+cmake_policy(SET CMP0003 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0077.html#cmp0077
+cmake_policy(SET CMP0077 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0077.html#cmp0077
+cmake_policy(SET CMP0112 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0112.html#cmp0112
 cmake_policy(SET CMP0141 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0141.html#policy:CMP0141
 cmake_policy(SET CMP0118 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0118.html#policy:CMP0118
 
@@ -21,28 +26,16 @@ if(MSVC)
 endif()
 
 option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
-option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)
+option(NBL_COMPILER_DYNAMIC_RUNTIME "" ON)
 option(NBL_SANITIZE_ADDRESS OFF)
 
-if(MSVC)
-	if(NBL_SANITIZE_ADDRESS)
-		set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>")
-	else()
-		set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug>:EditAndContinue>$<$<CONFIG:RelWithDebInfo>:ProgramDatabase>")
-	endif()
-endif()
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT $<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>) # ignored on non xMSVC-ABI targets
 
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")
 else()
-	if(MSVC)
-		if(NBL_DYNAMIC_MSVC_RUNTIME)
-			message(STATUS "Shared Nabla build enabled!")
-		else()
-			message(FATAL_ERROR "Turn NBL_DYNAMIC_MSVC_RUNTIME on! For dynamic Nabla builds dynamic MSVC runtime is mandatory!")
-		endif()
-	else()
-		message(FATAL_ERROR "Nabla can't be built with shared libraries! Please make sure you are targetting Windows OS and MSVC compiler!")
+	if(NOT NBL_COMPILER_DYNAMIC_RUNTIME)
+		message(FATAL_ERROR "Turn NBL_COMPILER_DYNAMIC_RUNTIME on! For dynamic Nabla builds dynamic runtime is mandatory!")
 	endif()
 endif()
 

CMakePresets.json

@@ -46,7 +46,7 @@
 			"hidden": true,
 			"inherits": "ci-configure-static-base",
 			"cacheVariables": {
-				"NBL_DYNAMIC_MSVC_RUNTIME": "OFF"
+				"NBL_COMPILER_DYNAMIC_RUNTIME": "OFF"
 			},
 			"condition": {
 				"type": "allOf",
@@ -69,7 +69,7 @@
 			"hidden": true,
 			"inherits": "ci-configure-dynamic-base",
 			"cacheVariables": {
-				"NBL_DYNAMIC_MSVC_RUNTIME": "ON"
+				"NBL_COMPILER_DYNAMIC_RUNTIME": "ON"
 			},
 			"condition": {
 				"type": "allOf",
@@ -156,7 +156,7 @@
 			"hidden": true,
 			"inherits": "user-configure-static-base",
 			"cacheVariables": {
-				"NBL_DYNAMIC_MSVC_RUNTIME": "OFF"
+				"NBL_COMPILER_DYNAMIC_RUNTIME": "OFF"
 			},
 			"condition": {
 				"type": "equals",
@@ -169,7 +169,7 @@
 			"hidden": true,
 			"inherits": "user-configure-dynamic-base",
 			"cacheVariables": {
-				"NBL_DYNAMIC_MSVC_RUNTIME": "ON"
+				"NBL_COMPILER_DYNAMIC_RUNTIME": "ON"
 			},
 			"condition": {
 				"type": "equals",
@@ -193,6 +193,22 @@
 			"generator": "Visual Studio 17 2022",
 			"toolset": "v143"
 		},
+		{
+			"name": "user-configure-static-clangcl",
+			"inherits": "user-configure-static-windows-base",
+			"displayName": "[USER]: Static library target, Visual Studio 17 2022 generator, ClangCL toolset",
+			"description": "Configure as static library with Visual Studio 17 2022 generator and ClangCL toolset",
+			"generator": "Visual Studio 17 2022",
+			"toolset": "ClangCL"
+		},
+		{
+			"name": "user-configure-dynamic-clangcl",
+			"inherits": "user-configure-dynamic-windows-base",
+			"displayName": "[USER]: Dynamic library target, Visual Studio 17 2022 generator, ClangCL toolset",
+			"description": "Configure as dynamic library with Visual Studio 17 2022 generator and ClangCL toolset",
+			"generator": "Visual Studio 17 2022",
+			"toolset": "ClangCL"
+		},
 		{
 			"name": "user-configure-static-ninja-multi",
 			"inherits": "user-configure-static-windows-base",