add NBL_TARGET_FORCE_ASSEMBLER_EXECUTABLE, enable CMAKE_EXPORT_COMPILE_COMMANDS for ninja generators, fix ninja + MSVC + VS generators builds, update git-version-tracking submodule with custom target byproduct fixes

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -180,6 +180,8 @@ option(WITH_JAVA "libjpeg-turbo" OFF)
 set(CMAKE_INSTALL_DOCDIR "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo/install/docdir")
 set(CMAKE_INSTALL_MANDIR "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo/install/mandir")
 add_subdirectory(libjpeg-turbo libjpeg-turbo EXCLUDE_FROM_ALL)
+NBL_TARGET_FORCE_ASSEMBLER_EXECUTABLE(simd ASM_NASM libjpeg-turbo/simd/)
+
 unset(CMAKE_INSTALL_DOCDIR)
 unset(CMAKE_INSTALL_MANDIR)
 

3rdparty/git-version-tracking

@@ -13,7 +13,11 @@ include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
-enable_language(C CXX ASM)
+enable_language(C CXX ASM ASM_NASM)
+
+if(MSVC)
+	enable_language(ASM_MASM)
+endif()
 
 option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
 option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)

CMakeLists.txt

@@ -5,7 +5,6 @@
 		"minor": 29,
 		"patch": 2
 	},
-
 	"configurePresets": [
 		{
 			"name": "ci-configure-base",
@@ -109,21 +108,27 @@
 			"inherits": "ci-configure-static-windows-base",
 			"displayName": "[CI]: Static library target, Ninja multi-config generator",
 			"description": "Configure as static library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "ci-configure-dynamic-ninja-multi",
 			"inherits": "ci-configure-dynamic-windows-base",
 			"displayName": "[CI]: Dynamic library target, Ninja multi-config generator",
 			"description": "Configure as dynamic library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-base",
 			"hidden": true,
 			"cacheVariables": {
 				"NBL_CI_MODE": "OFF",
-				"NBL_UPDATE_GIT_SUBMODULE": "ON",
+				"NBL_UPDATE_GIT_SUBMODULE": "OFF",
 				"NBL_RUN_TESTS": "OFF",
 				"NBL_CPACK_CI": "OFF"
 			}
@@ -193,14 +198,20 @@
 			"inherits": "user-configure-static-windows-base",
 			"displayName": "[USER]: Static library target, Ninja multi-config generator",
 			"description": "Configure as static library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-dynamic-ninja-multi",
 			"inherits": "user-configure-dynamic-windows-base",
 			"displayName": "[USER]: Dynamic library target, Ninja multi-config generator",
 			"description": "Configure as dynamic library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-static-ninja-release",
@@ -209,7 +220,8 @@
 			"description": "Configure as static Release library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
+				"CMAKE_BUILD_TYPE": "Release",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -219,7 +231,8 @@
 			"description": "Configure as dynamic Release library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
+				"CMAKE_BUILD_TYPE": "Release",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -229,7 +242,8 @@
 			"description": "Configure as static RelWithDebInfo library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -239,7 +253,8 @@
 			"description": "Configure as dynamic RelWithDebInfo library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -249,7 +264,8 @@
 			"description": "Configure as static Debug library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
+				"CMAKE_BUILD_TYPE": "Debug",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -259,7 +275,8 @@
 			"description": "Configure as dynamic Debug library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
+				"CMAKE_BUILD_TYPE": "Debug",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		}
 	],
@@ -413,7 +430,6 @@
 			"displayName": "[USER]: Dynamic Debug library target, Ninja single-config generator",
 			"description": "Build Nabla as dynamic Debug library with Ninja single-config generator"
 		}
-		
 	],
 	"packagePresets": [
 		{

CMakePresets.json

@@ -1321,4 +1321,15 @@ function(NBL_IMPORT_VS_CONFIG)
 		message(FATAL_ERORR "Cannot request importing VS config, doesn't meet requirements!")
 	endif()
 
-endfunction()
+endfunction()
+
+macro(NBL_TARGET_FORCE_ASSEMBLER_EXECUTABLE _NBL_TARGET_ _NBL_ASM_DIALECT_ _NBL_PREPEND_PATH_TRANSFORM_)
+	get_target_property(_NBL_TARGET_SOURCES_ "${_NBL_TARGET_}" SOURCES)
+	list(FILTER _NBL_TARGET_SOURCES_ INCLUDE REGEX "\\.asm$")
+	list(TRANSFORM _NBL_TARGET_SOURCES_ PREPEND "${_NBL_PREPEND_PATH_TRANSFORM_}")
+
+	set_source_files_properties(${_NBL_TARGET_SOURCES_}
+		TARGET_DIRECTORY "${_NBL_TARGET_}"
+		PROPERTIES LANGUAGE "${_NBL_ASM_DIALECT_}"
+	)
+endmacro()