toolchain: Clean up add_module()

kernel/CMakeLists.txt

@@ -2,13 +2,11 @@
 
 target_sources(menix PUBLIC main.c)
 
-set_target_properties(menix PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
+set_target_properties(menix PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 # Mark entry point.
 target_link_options(menix PUBLIC -e kernel_boot)
 
-set(MENIX_CURRENT_MOD menix CACHE INTERNAL "")
-
 add_subdirectory(arch/${MENIX_ARCH})
 add_subdirectory(boot)
 add_subdirectory(fs)

modules/CMakeLists.txt

@@ -1,4 +1,5 @@
-# Modules
+# Kernel modules and drivers
+# Add new categories at the end of this file
 
 add_library(menix_builtin INTERFACE)
 
@@ -9,55 +10,51 @@ add_library(menix_builtin INTERFACE)
 # * modular		If the module supports dynamic loading (ON/OFF)
 # * default		Default configuration value (ON/MOD/OFF)
 function(add_module name author desc modular default)
-	set(MENIX_CURRENT_MOD ${name} CACHE INTERNAL "")
-
-	# If the option is not in cache yet, use the default value.
-	if(NOT DEFINED CACHE{${MENIX_CURRENT_MOD}})
-		set(${MENIX_CURRENT_MOD} ${default} CACHE INTERNAL "")
+	# If the option is not overridden, use the default value.
+	if(NOT DEFINED ${name})
+		set(${name} ${default})
 	endif()
 
 	# Check if this module is modular and if not, if we're trying to build it as such.
-	if(modular STREQUAL OFF AND ${MENIX_CURRENT_MOD} STREQUAL MOD)
-		message(FATAL_ERROR "[!] Module \"${MENIX_CURRENT_MOD}\" can't be built as modular!\n")
+	if(modular STREQUAL OFF AND name STREQUAL MOD)
+		message(FATAL_ERROR "[!] Module \"${name}\" can't be built as modular!\n")
 	endif()
 
-	if(${${MENIX_CURRENT_MOD}} STREQUAL ON)
+	if(${name} STREQUAL ON)
 		# Build as an object library to retain e.g. the module struct since
 		# it's technically not referenced anywhere. The linker will discard
 		# them otherwise.
-		add_library(${MENIX_CURRENT_MOD} OBJECT ${ARGN})
-		target_link_libraries(menix PUBLIC $<TARGET_OBJECTS:${MENIX_CURRENT_MOD}>)
+		add_library(${name} OBJECT ${ARGN})
+		target_link_libraries(menix PUBLIC $<TARGET_OBJECTS:${name}>)
 
 		# If built-in, define MODULE_TYPE to let the module know.
-		target_compile_definitions(${MENIX_CURRENT_MOD} PRIVATE MODULE_TYPE='B')
-		target_link_libraries(${MENIX_CURRENT_MOD} PRIVATE common_kernel)
-	elseif(${${MENIX_CURRENT_MOD}} STREQUAL MOD)
+		target_compile_definitions(${name} PRIVATE MODULE_TYPE='B')
+		target_link_libraries(${name} PRIVATE common_kernel)
+	elseif(${name} STREQUAL MOD)
 		# Build as an "executable" but in reality, link with -shared.
-		add_executable(${MENIX_CURRENT_MOD} ${ARGN})
-		set_target_properties(${MENIX_CURRENT_MOD} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-		set_target_properties(${MENIX_CURRENT_MOD} PROPERTIES RUNTIME_OUTPUT_NAME "${MENIX_CURRENT_MOD}")
+		add_executable(${name} ${ARGN})
+		set_target_properties(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/modules")
+		set_target_properties(${name} PROPERTIES RUNTIME_OUTPUT_NAME "${name}")
 
 		# If modular, define MODULE_TYPE to let the module know.
-		target_compile_definitions(${MENIX_CURRENT_MOD} PRIVATE MODULE_TYPE='M')
-		target_link_libraries(${MENIX_CURRENT_MOD} PRIVATE common_ko)
+		target_compile_definitions(${name} PRIVATE MODULE_TYPE='M')
+		target_link_libraries(${name} PRIVATE common_ko)
 	endif()
 
 	# Shared flags
-	if(${${MENIX_CURRENT_MOD}} STREQUAL ON OR ${${MENIX_CURRENT_MOD}} STREQUAL MOD)
-		target_link_libraries(${MENIX_CURRENT_MOD} PRIVATE common)
-		target_compile_definitions(${MENIX_CURRENT_MOD} PRIVATE
+	if(${name} STREQUAL ON OR ${name} STREQUAL MOD)
+		target_link_libraries(${name} PRIVATE common)
+		target_compile_definitions(${name} PRIVATE
 			MODULE_NAME="${name}"
 			MODULE_AUTHOR="${author}"
 			MODULE_DESCRIPTION="${desc}"
 		)
 
 		# Add local include directory to search path.
-		target_include_directories(${MENIX_CURRENT_MOD} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+		target_include_directories(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 	endif()
 endfunction(add_module)
 
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/modules")
-
 # Architecture dependent drivers
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/arch/${MENIX_ARCH})
 	add_subdirectory(arch/${MENIX_ARCH})

modules/gpu/udrm/CMakeLists.txt

@@ -7,6 +7,6 @@ add_module(udrm "Marvin Friedrich" "uDRM Bridge" OFF ON
 	udrm/src/udrm_virtio.c
 )
 
-if(TARGET ${MENIX_CURRENT_MOD})
-	target_include_directories(${MENIX_CURRENT_MOD} PRIVATE udrm/include)
+if(TARGET udrm)
+	target_include_directories(udrm PRIVATE udrm/include)
 endif()