Merge branch 'develop' into fix/node-python-await-deadlock

Author: viferga

source/cli/CMakeLists.txt

@@ -4,6 +4,12 @@ if(NOT OPTION_BUILD_CLI)
 	return()
 endif()
 
+# Check if the dependency loaders are enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_EXTENSIONS OR NOT OPTION_BUILD_LOADERS_NODE)
+	message(WARNING "The Extension and NodeJS Loaders are a dependency of the CLI, in order to compile the CLI, enable them with -DOPTION_BUILD_LOADERS_EXT=ON -DOPTION_BUILD_LOADERS_NODE=ON")
+	return()
+endif()
+
 # CLI applications
 add_subdirectory(metacallcli)
 add_subdirectory(plugins)

source/cli/metacallcli/CMakeLists.txt

@@ -1,9 +1,3 @@
-# Check if this loader is enabled
-if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_EXTENSIONS OR NOT OPTION_BUILD_LOADERS_NODE)
-	message(WARNING "The Extension and NodeJS loaders are a dependency of the CLI, in order to compile the CLI, enable them with -DOPTION_BUILD_LOADERS_EXT=ON -DOPTION_BUILD_LOADERS_NODE=ON")
-	return()
-endif()
-
 #
 # Executable name and options
 #

source/cli/plugins/CMakeLists.txt

@@ -1,8 +1,3 @@
-#Check if extension loader is enabled
-if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_EXTENSIONS)
-	return()
-endif()
-
 #
 # NodeJS Dependency
 #

source/tests/metacall_configuration_exec_path_test/CMakeLists.txt

@@ -192,6 +192,7 @@ test_environment_variables(${target}
 	"CONFIGURATION_PATH=${PY_CONFIGURATION_PATH}/global.json"
 	"SERIAL_LIBRARY_PATH=${SERIAL_LIBRARY_PATH}"
 	"DETOUR_LIBRARY_PATH=${DETOUR_LIBRARY_PATH}"
+	"${TESTS_SANITIZER_ENVIRONMENT_VARIABLES}"
 )
 
 #