request only python interpreter and correct its variable name, add more validation and fix bugs, set builtin resources library target CXX_STANDARD to 20

Author: AnastaZIuk

src/nbl/builtin/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package (Python3 COMPONENTS Interpreter REQUIRED)
+
 include("${CMAKE_CURRENT_SOURCE_DIR}/utils.cmake")
 
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "nbl/builtin/glsl/utils/acceleration_structures.glsl")

src/nbl/builtin/utils.cmake

@@ -1,5 +1,3 @@
-find_package(Python3 REQUIRED)
-
 macro(LIST_BUILTIN_RESOURCE _BUNDLE_NAME_ _LBR_PATH_)
 	set(_OPTIONAL_ALIAS_ "${ARGV2}")
 
@@ -11,6 +9,10 @@ macro(LIST_BUILTIN_RESOURCE _BUNDLE_NAME_ _LBR_PATH_)
 endmacro()
 
 function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH_DIRECTORY_ _NAMESPACE_ _OUTPUT_DIRECTORY_)
+	if(NOT DEFINED Python3_EXECUTABLE)
+		message(FATAL_ERROR "Python3_EXECUTABLE must be defined!")
+	endif()
+
 	file(MAKE_DIRECTORY "${_OUTPUT_DIRECTORY_}")
 
 	set(NBL_TEMPLATE_APK_RESOURCES_ARCHIVE_HEADER "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/CArchive.h.in")
@@ -57,26 +59,23 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 
 	set(NBL_BUILTIN_RESOURCES_HEADER "${_OUTPUT_DIRECTORY_}/${NBL_BS_HEADER_FILENAME}")
 	set(NBL_BUILTIN_RESOURCE_DATA_SOURCE "${_OUTPUT_DIRECTORY_}/${NBL_BS_DATA_SOURCE_FILENAME}")
-	
-	set(_NBL_SOURCES_
-		"${NBL_BUILTIN_RESOURCES_HEADER}"
-		"${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
-	)
 
 	add_custom_command(
 		OUTPUT "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_HEADER}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${_GUARD_SUFFIX_}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}"
+		COMMAND "${Python3_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_HEADER}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${_GUARD_SUFFIX_}"
+		COMMAND "${Python3_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}"
 		COMMENT "Generating built-in resources"
 		DEPENDS ${NBL_DEPENDENCY_FILES}
 		VERBATIM  
 	)
 
 	add_library(${_TARGET_NAME_} STATIC
-		${_NBL_SOURCES_}
+		"${NBL_BUILTIN_RESOURCES_HEADER}"
+		"${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
 	)
 
 	target_include_directories(${_TARGET_NAME_} PUBLIC "${NBL_ROOT_PATH}/include")
+	set_target_properties(${_TARGET_NAME_} PROPERTIES CXX_STANDARD 20)
 
 	if(NBL_DYNAMIC_MSVC_RUNTIME)
 		set_property(TARGET ${_TARGET_NAME_} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")