Corrected module definition for loaders and metacall distributable from threading model refactor.

Author: viferga

source/CMakeLists.txt

@@ -110,27 +110,6 @@ add_subdirectory(configuration)
 add_subdirectory(loader)
 add_subdirectory(metacall)
 
-# Define loader modules (for loaders and distributable)
-set(LOADER_MODULE_NAMES
-	version
-	preprocessor
-	environment
-	format
-	log
-	memory
-	portability
-	threading
-	adt
-	filesystem
-	reflect
-	dynlink
-	serial
-	configuration
-	loader
-	detour
-	metacall
-)
-
 # Tests
 set(IDE_FOLDER "Tests")
 add_subdirectory(tests)

source/distributable/CMakeLists.txt

@@ -44,8 +44,29 @@ include(Distributable)
 # Create unity build library
 set(metacall_unity_build "${CMAKE_CURRENT_BINARY_DIR}/${target_root}_unity_build.c")
 
+# Define metacall modules
+set(METACALL_MODULE_NAMES
+	version
+	preprocessor
+	environment
+	format
+	log
+	memory
+	portability
+	threading
+	adt
+	filesystem
+	reflect
+	dynlink
+	serial
+	configuration
+	loader
+	detour
+	metacall
+)
+
 distributable_export_generate(${metacall_unity_build}
-	${LOADER_MODULE_NAMES}
+	${METACALL_MODULE_NAMES}
 )
 
 # Build library
@@ -55,7 +76,7 @@ add_library(${target}
 
 # Add target dependencies
 add_dependencies(${target}
-	${LOADER_MODULE_NAMES}
+	${METACALL_MODULE_NAMES}
 )
 
 # Create namespaced alias

source/loaders/CMakeLists.txt

@@ -3,6 +3,26 @@ if(NOT OPTION_BUILD_LOADERS)
 	return()
 endif()
 
+# Define loader modules
+set(LOADER_MODULE_NAMES
+	version
+	preprocessor
+	environment
+	format
+	log
+	memory
+	portability
+	threading
+	adt
+	filesystem
+	reflect
+	dynlink
+	serial
+	configuration
+	loader
+	detour
+)
+
 # Plugins options
 option(OPTION_BUILD_LOADERS_C "Build C Foreign Function Interface library loader plugin." OFF)
 option(OPTION_BUILD_LOADERS_COB "Build GNU/COBOL 2.2 loader plugin." OFF)