Improved build system of MetaCall, implemented unity build properly and remove object libraries which were causing problems in MinGW builds.

viferga · viferga · commit ba0d8b49d765 · 2021-09-21T21:51:19.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,8 +69,8 @@ set(META_NAME_VERSION			"${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_R
 #
 
 # Project options
-option(BUILD_SHARED_LIBS		"Build shared instead of static libraries."					ON)
-option(OPTION_SELF_CONTAINED	"Create a self-contained install with all dependencies."	OFF)
+option(BUILD_SHARED_LIBS		"Build shared instead of static libraries."					ON) # TODO: Static libraries build is not implemented yet
+option(OPTION_SELF_CONTAINED	"Create a self-contained install with all dependencies."	OFF) # TODO: Not implemented
 option(OPTION_BUILD_TESTS		"Build tests."												ON)
 option(OPTION_BUILD_BENCHMARKS	"Build benchmarks."											OFF)
 option(OPTION_BUILD_DOCS		"Build documentation."										OFF)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -168,26 +168,22 @@ install_print("green" "LOADER_SCRIPT_PATH:")
 	install_print("normal" "\tInstall Location: N/A")
 	install_print("normal" "\tDefault Location: scripts")
 
-if(BUILD_SHARED_LIBS)
-	install_print("green" "LOADER_LIBRARY_PATH:")
-		install_print("normal" "\tDescription: Directory where MetaCall loader plugins are located")
-		install_print("normal" "\tInstall Location: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB}")
-		install_print("normal" "\tDefault Location: .")
-endif()
-
 install_print("green" "CONFIGURATION_PATH:")
 	install_print("normal" "\tDescription: Path to the main global MetaCall configuration")
 	install_print("normal" "\tInstall Location: ${CMAKE_INSTALL_PREFIX}/${INSTALL_DATA}/configurations/global.json")
 	install_print("normal" "\tDefault Location: configurations/global.json")
 
 if(BUILD_SHARED_LIBS)
+	install_print("green" "LOADER_LIBRARY_PATH:")
+		install_print("normal" "\tDescription: Directory where MetaCall loader plugins are located")
+		install_print("normal" "\tInstall Location: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB}")
+		install_print("normal" "\tDefault Location: .")
+
 	install_print("green" "SERIAL_LIBRARY_PATH:")
 		install_print("normal" "\tDescription: Directory where MetaCall serial plugins are located")
 		install_print("normal" "\tInstall Location: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB}")
 		install_print("normal" "\tDefault Location: serials")
-endif()
 
-if(BUILD_SHARED_LIBS)
 	install_print("green" "DETOUR_LIBRARY_PATH:")
 		install_print("normal" "\tDescription: Directory where MetaCall detour plugins are located")
 		install_print("normal" "\tInstall Location: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB}")
diff --git a/source/adt/CMakeLists.txt b/source/adt/CMakeLists.txt
@@ -68,7 +68,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/backtrace/CMakeLists.txt b/source/backtrace/CMakeLists.txt
@@ -63,7 +63,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/configuration/CMakeLists.txt b/source/configuration/CMakeLists.txt
@@ -61,7 +61,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/detour/CMakeLists.txt b/source/detour/CMakeLists.txt
@@ -60,7 +60,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/dynlink/CMakeLists.txt b/source/dynlink/CMakeLists.txt
@@ -81,7 +81,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
@@ -165,7 +165,7 @@ target_link_libraries(${target}
 	PUBLIC
 	${DEFAULT_LIBRARIES}
 
-	${CMAKE_DL_LIBS} # Native dynamic load library
+	$<$<BOOL:${BUILD_SHARED_LIBS}>:${CMAKE_DL_LIBS}> # Native dynamic load library
 
 	INTERFACE
 )
diff --git a/source/environment/CMakeLists.txt b/source/environment/CMakeLists.txt
@@ -58,7 +58,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/filesystem/CMakeLists.txt b/source/filesystem/CMakeLists.txt
@@ -85,7 +85,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/format/CMakeLists.txt b/source/format/CMakeLists.txt
@@ -57,7 +57,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/loader/CMakeLists.txt b/source/loader/CMakeLists.txt
@@ -67,7 +67,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/log/CMakeLists.txt b/source/log/CMakeLists.txt
@@ -125,7 +125,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/memory/CMakeLists.txt b/source/memory/CMakeLists.txt
@@ -66,7 +66,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/metacall/CMakeLists.txt b/source/metacall/CMakeLists.txt
@@ -86,8 +86,59 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 # Create library
 #
 
+# Include here any library which metacall depends on
+set(unity_build_depends
+	version
+	preprocessor
+	environment
+	format
+	backtrace
+	threading
+	log
+	memory
+	portability
+	adt
+	filesystem
+	dynlink
+	detour
+	reflect
+	serial
+	configuration
+	loader
+)
+
+set(unity_build_source_list)
+set(unity_build_definition_list)
+set(unity_build_include_list)
+
+foreach(tgt ${unity_build_depends})
+	# Get target source files
+	get_target_property(target_sources
+		${META_PROJECT_NAME}::${tgt}
+		SOURCES
+	)
+
+	set(unity_build_source_list
+		${unity_build_source_list}
+		${target_sources}
+	)
+
+	# Set target definitions
+	set(unity_build_definition_list
+		${unity_build_definition_list}
+		$<TARGET_PROPERTY:${META_PROJECT_NAME}::${tgt},COMPILE_DEFINITIONS>
+	)
+
+	# Set target include paths
+	set(unity_build_include_list
+		${unity_build_include_list}
+		$<TARGET_PROPERTY:${META_PROJECT_NAME}::${tgt},INCLUDE_DIRECTORIES>
+	)
+endforeach()
+
 # Build library
 add_library(${target}
+	${unity_build_source_list}
 	${sources}
 	${headers}
 )
@@ -141,6 +192,9 @@ set_target_properties(${target}
 
 target_include_directories(${target}
 	PRIVATE
+	# Dependencies Includes
+	${unity_build_include_list}
+
 	${PROJECT_BINARY_DIR}/source/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}/include
@@ -160,23 +214,6 @@ target_include_directories(${target}
 
 target_link_libraries(${target}
 	PRIVATE
-	${META_PROJECT_NAME}::version
-	${META_PROJECT_NAME}::preprocessor
-	${META_PROJECT_NAME}::environment
-	${META_PROJECT_NAME}::format
-	${META_PROJECT_NAME}::backtrace
-	${META_PROJECT_NAME}::threading
-	${META_PROJECT_NAME}::log
-	${META_PROJECT_NAME}::memory
-	${META_PROJECT_NAME}::portability
-	${META_PROJECT_NAME}::adt
-	${META_PROJECT_NAME}::filesystem
-	${META_PROJECT_NAME}::dynlink
-	${META_PROJECT_NAME}::detour
-	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::serial
-	${META_PROJECT_NAME}::configuration
-	${META_PROJECT_NAME}::loader
 
 	PUBLIC
 	${DEFAULT_LIBRARIES}
@@ -191,23 +228,7 @@ target_link_libraries(${target}
 target_compile_definitions(${target}
 	PRIVATE
 	# Dependencies Export API
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::version,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::preprocessor,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::environment,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::format,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::backtrace,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::threading,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::log,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::memory,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::portability,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::adt,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::filesystem,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::dynlink,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::detour,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::reflect,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::serial,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::configuration,COMPILE_DEFINITIONS>
-	$<TARGET_PROPERTY:${META_PROJECT_NAME}::loader,COMPILE_DEFINITIONS>
+	${unity_build_definition_list}
 
 	# MetaCall Export API
 	${target_upper}_EXPORTS
@@ -245,6 +266,8 @@ target_link_libraries(${target}
 	PUBLIC
 	${DEFAULT_LINKER_OPTIONS}
 
+	$<$<BOOL:${BUILD_SHARED_LIBS}>:${CMAKE_DL_LIBS}> # Native dynamic load library
+
 	INTERFACE
 )
 
diff --git a/source/portability/CMakeLists.txt b/source/portability/CMakeLists.txt
@@ -55,7 +55,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/ports/js_port/CMakeLists.txt b/source/ports/js_port/CMakeLists.txt
@@ -365,8 +365,6 @@ target_link_libraries(${js_port_test}
 	PRIVATE
 	${V8_LIBRARIES} # V8 library
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 
 	PUBLIC
diff --git a/source/preprocessor/CMakeLists.txt b/source/preprocessor/CMakeLists.txt
@@ -88,7 +88,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/reflect/CMakeLists.txt b/source/reflect/CMakeLists.txt
@@ -98,7 +98,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/serial/CMakeLists.txt b/source/serial/CMakeLists.txt
@@ -60,7 +60,7 @@ source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
 #
 
 # Build library
-add_library(${target} OBJECT
+add_library(${target}
 	${sources}
 	${headers}
 )
diff --git a/source/tests/metacall_clear_test/CMakeLists.txt b/source/tests/metacall_clear_test/CMakeLists.txt
@@ -93,8 +93,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_configuration_exec_path_test/CMakeLists.txt b/source/tests/metacall_configuration_exec_path_test/CMakeLists.txt
@@ -92,7 +92,7 @@ target_link_libraries(${target}
 	${DEFAULT_LIBRARIES}
 
 	GTest
-	${CMAKE_DL_LIBS}
+
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_depends_test/CMakeLists.txt b/source/tests/metacall_depends_test/CMakeLists.txt
@@ -93,8 +93,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_distributable_test/CMakeLists.txt b/source/tests/metacall_distributable_test/CMakeLists.txt
@@ -88,8 +88,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_handle_export_test/CMakeLists.txt b/source/tests/metacall_handle_export_test/CMakeLists.txt
@@ -93,8 +93,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_handle_get_test/CMakeLists.txt b/source/tests/metacall_handle_get_test/CMakeLists.txt
@@ -93,8 +93,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_init_fini_test/CMakeLists.txt b/source/tests/metacall_init_fini_test/CMakeLists.txt
@@ -93,8 +93,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_inspect_test/CMakeLists.txt b/source/tests/metacall_inspect_test/CMakeLists.txt
@@ -88,8 +88,6 @@ target_link_libraries(${target}
 
 	GTest
 
-	${CMAKE_DL_LIBS}
-
 	${META_PROJECT_NAME}::metacall
 )
 
diff --git a/source/tests/metacall_python_django_integration_test/CMakeLists.txt b/source/tests/metacall_python_django_integration_test/CMakeLists.txt
diff --git a/source/tests/metacall_python_gc_test/CMakeLists.txt b/source/tests/metacall_python_gc_test/CMakeLists.txt
diff --git a/source/tests/metacall_ruby_rails_integration_test/CMakeLists.txt b/source/tests/metacall_ruby_rails_integration_test/CMakeLists.txt
diff --git a/source/threading/CMakeLists.txt b/source/threading/CMakeLists.txt
diff --git a/source/version/CMakeLists.txt b/source/version/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`68`	`68`	`#`
`69`	`69`
`70`	`70`	`# Build library`
`71`		`-add_library(${target} OBJECT`
	`71`	`+add_library(${target}`
`72`	`72`	`${sources}`
`73`	`73`	`${headers}`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`63`	`63`	`#`
`64`	`64`
`65`	`65`	`# Build library`
`66`		`-add_library(${target} OBJECT`
	`66`	`+add_library(${target}`
`67`	`67`	`${sources}`
`68`	`68`	`${headers}`
`69`	`69`	`)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`61`	`61`	`#`
`62`	`62`
`63`	`63`	`# Build library`
`64`		`-add_library(${target} OBJECT`
	`64`	`+add_library(${target}`
`65`	`65`	`${sources}`
`66`	`66`	`${headers}`
`67`	`67`	`)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`60`	`60`	`#`
`61`	`61`
`62`	`62`	`# Build library`
`63`		`-add_library(${target} OBJECT`
	`63`	`+add_library(${target}`
`64`	`64`	`${sources}`
`65`	`65`	`${headers}`
`66`	`66`	`)`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`81`	`81`	`#`
`82`	`82`
`83`	`83`	`# Build library`
`84`		`-add_library(${target} OBJECT`
	`84`	`+add_library(${target}`
`85`	`85`	`${sources}`
`86`	`86`	`${headers}`
`87`	`87`	`)`
`@@ -165,7 +165,7 @@ target_link_libraries(${target}`
`165`	`165`	`PUBLIC`
`166`	`166`	`${DEFAULT_LIBRARIES}`
`167`	`167`
`168`		`- ${CMAKE_DL_LIBS} # Native dynamic load library`
	`168`	`+ $<$<BOOL:${BUILD_SHARED_LIBS}>:${CMAKE_DL_LIBS}> # Native dynamic load library`
`169`	`169`
`170`	`170`	`INTERFACE`
`171`	`171`	`)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`58`	`58`	`#`
`59`	`59`
`60`	`60`	`# Build library`
`61`		`-add_library(${target} OBJECT`
	`61`	`+add_library(${target}`
`62`	`62`	`${sources}`
`63`	`63`	`${headers}`
`64`	`64`	`)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`85`	`85`	`#`
`86`	`86`
`87`	`87`	`# Build library`
`88`		`-add_library(${target} OBJECT`
	`88`	`+add_library(${target}`
`89`	`89`	`${sources}`
`90`	`90`	`${headers}`
`91`	`91`	`)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ source_group_by_path(${source_path} "\\\\.cpp$\|\\\\.c$\|\\\\.h$\|\\\\.hpp$"`
`57`	`57`	`#`
`58`	`58`
`59`	`59`	`# Build library`
`60`		`-add_library(${target} OBJECT`
	`60`	`+add_library(${target}`
`61`	`61`	`${sources}`
`62`	`62`	`${headers}`
`63`	`63`	`)`