Refactor

Author: Przemog1

CMakeLists.txt

@@ -66,21 +66,11 @@ set(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH "${NBL_ROOT_PATH}/include/nbl/builtin")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NBL_ROOT_PATH}/cmake" CACHE PATH "")
 get_property(NBL_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
+include(common)
 #import .vsconfig file with VS components required for Nabla
-if(WIN32 AND MSVC)
-	option(NBL_IMPORT_VS_CONFIG "" ON)
-
-	if(NBL_IMPORT_VS_CONFIG)
-		message(STATUS "NOTICE: Configuration will continue after Visual Studio Installer is closed.")
-		message(STATUS "To disable VS config import uncheck the NBL_IMPORT_VS_CONFIG option.")
-		set(DEVENV_ISOLATION_INI_PATH "${CMAKE_GENERATOR_INSTANCE}/Common7/IDE/devenv.isolation.ini")
-		file(READ ${DEVENV_ISOLATION_INI_PATH} DEVENV_ISOLATION_INI_CONTENT)
-		string(REGEX MATCH "SetupEngineFilePath=\"([^\"]*)\"" _match "${DEVENV_ISOLATION_INI_CONTENT}")
-		string(REPLACE "/" "\\" NBL_VS_INSTALLATION_PATH ${CMAKE_GENERATOR_INSTANCE})
-		set(VS_INSTALLER_PATH "${CMAKE_MATCH_1}")
-
-		execute_process(COMMAND "${VS_INSTALLER_PATH}" modify --installPath "${NBL_VS_INSTALLATION_PATH}" --config "${NBL_ROOT_PATH}/.vsconfig" --allowUnsignedExtensions)
-	endif()
+if(WIN32 AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+	option(NBL_ENABLE_VS_CONFIG_IMPORT "" OFF)
+	NBL_IMPORT_VS_CONFIG()
 endif()
 
 # Configure CCache if available
@@ -206,7 +196,6 @@ get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE
 
 include(submodules/update)
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
-include(common)
 
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 

cmake/common.cmake

@@ -1298,4 +1298,25 @@ macro(NBL_GET_ALL_TARGETS_RECURSIVE NBL_TARGETS NBL_DIRECTORY)
 
     get_property(NBL_GATHERED_TARGETS DIRECTORY ${NBL_DIRECTORY} PROPERTY BUILDSYSTEM_TARGETS)
     list(APPEND ${NBL_TARGETS} ${NBL_GATHERED_TARGETS})
-endmacro()
+endmacro()
+
+function(NBL_IMPORT_VS_CONFIG)
+	if(NBL_ENABLE_VS_CONFIG_IMPORT)
+		message(STATUS "NOTICE: Configuration will continue after Visual Studio Installer is closed.")
+		message(STATUS "To disable VS config import disable the NBL_IMPORT_VS_CONFIG option.")
+		set(NBL_DEVENV_ISOLATION_INI_PATH "${CMAKE_GENERATOR_INSTANCE}/Common7/IDE/devenv.isolation.ini")
+		file(READ ${NBL_DEVENV_ISOLATION_INI_PATH} NBL_DEVENV_ISOLATION_INI_CONTENT)
+		string(REPLACE "/" "\\" NBL_VS_INSTALLATION_PATH ${CMAKE_GENERATOR_INSTANCE})
+		string(REGEX MATCH "SetupEngineFilePath=\"([^\"]*)\"" _match "${NBL_DEVENV_ISOLATION_INI_CONTENT}")
+		set(NBL_VS_INSTALLER_PATH "${CMAKE_MATCH_1}")
+
+		execute_process(COMMAND "${NBL_VS_INSTALLER_PATH}" modify --installPath "${NBL_VS_INSTALLATION_PATH}" --config "${NBL_ROOT_PATH}/.vsconfig" --allowUnsignedExtensions
+			ERROR_VARIABLE vsconfig_error
+			RESULT_VARIABLE vsconfig_result)
+
+		if(NOT vsconfig_result EQUAL 0)
+    		message(FATAL_ERROR "Visual Studio Installer error: ${vsconfig_error}")
+		endif()
+
+	endif()
+endfunction()