Solved some bugs when the project does not have any loader selected.

Author: viferga

cmake/GeneratorExpressions.cmake

@@ -33,10 +33,13 @@
 # 	https://gitlab.kitware.com/cmake/cmake/-/issues/19467
 
 macro(cmake_expand_generator_expressions output)
+	# Convert the list of parameters into a list of arguments
 	set(CMAKE_GENERATOR_EXPRESSION_LIST "${ARGN}")
 	set(GENERATOR_EXPRESSION_TEMP_PATH "${CMAKE_CURRENT_BINARY_DIR}/cmake_expand_generator_expressions")
 	string(REGEX REPLACE ";" " " CMAKE_GENERATOR_EXPRESSION_LIST "${CMAKE_GENERATOR_EXPRESSION_LIST}")
 	string(REGEX REPLACE "\n" " " CMAKE_GENERATOR_EXPRESSION_LIST "${CMAKE_GENERATOR_EXPRESSION_LIST}")
+
+	# Generate a CMake script for executing it (needs the build phase to evaluate the generator expressions)
 	set(contents
 		"file(GENERATE"
 		"	OUTPUT \"${GENERATOR_EXPRESSION_TEMP_PATH}/output.tmp\""
@@ -55,8 +58,13 @@ macro(cmake_expand_generator_expressions output)
 		"${GENERATOR_EXPRESSION_TEMP_PATH}/output.tmp"
 		GENERATED_OUTPUT
 	)
+
 	# This is to avoid possible side effects, but I decided to remove it for caching purposes
 	# file(REMOVE_RECURSE "${GENERATOR_EXPRESSION_TEMP_PATH}")
+
+	# Clean the output and generate a list
+	string(STRIP "${GENERATED_OUTPUT}" GENERATED_OUTPUT)
+	string(REGEX REPLACE "\n" "" GENERATED_OUTPUT "${GENERATED_OUTPUT}")
 	string(REGEX REPLACE " " ";" GENERATED_OUTPUT "${GENERATED_OUTPUT}")
 	set(${output} "${GENERATED_OUTPUT}")
 endmacro()

source/tests/metacall_python_callback_test/CMakeLists.txt

@@ -1,14 +1,14 @@
-#
-# Executable name and options
-#
-
 # Check if loaders, scripts and ports are enabled
 if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_LOADERS_NODE
 	OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_PY
 	OR NOT OPTION_BUILD_PORTS OR NOT OPTION_BUILD_PORTS_PY)
 	return()
 endif()
 
+#
+# Executable name and options
+#
+
 # Target name
 set(target metacall-python-callback-test)
 message(STATUS "Test ${target}")

source/tests/metacall_reinitialize_test/CMakeLists.txt

@@ -1,3 +1,8 @@
+# Check if loaders, scripts and ports are enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_MOCK)
+	return()
+endif()
+
 #
 # Executable name and options
 #
@@ -123,7 +128,7 @@ add_test(NAME ${target}
 #
 
 add_dependencies(${target}
-	py_loader
+	mock_loader
 )
 
 #

source/tests/metacall_return_monad_test/CMakeLists.txt

@@ -1,3 +1,8 @@
+# Check if loaders, scripts and ports are enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY)
+	return()
+endif()
+
 #
 # Executable name and options
 #