BuildSystem: Rework the whole cmake build system

Now files are installed using the install() command instead of manually copying files to their destinations. This allows automatic recompilation of headers that did not work previously
2024-06-19 04:20:23 +03:00
parent 318ce5dec8
commit ad6d95ba52
90 changed files with 546 additions and 1074 deletions
--- a/userspace/libraries/CMakeLists.txt
+++ b/userspace/libraries/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libraries CXX)
-
 set(USERSPACE_LIBRARIES
 	LibC
 	LibELF
@@ -11,23 +7,17 @@ set(USERSPACE_LIBRARIES
 	LibInput
 )

-foreach(LIBRARY ${USERSPACE_LIBRARIES})
-	add_subdirectory(${LIBRARY})
+foreach(library ${USERSPACE_LIBRARIES})
+	add_subdirectory(${library})
 endforeach()

 add_custom_target(libraries)
-add_custom_target(libraries-headers)
-add_custom_target(libraries-install)

-foreach(LIBRARY ${USERSPACE_LIBRARIES})
-	string(TOLOWER ${LIBRARY} LIBRARY_LOWER)
-
-	if (TARGET ${LIBRARY_LOWER})
-		add_dependencies(libraries ${LIBRARY_LOWER})
+foreach(library ${USERSPACE_LIBRARIES})
+	string(TOLOWER ${library} library_lower)
+	if (TARGET ${library_lower})
+		add_dependencies(libraries ${library_lower})
 		# This is to allow cmake to link when libc updates
-		target_link_options(${LIBRARY_LOWER} PRIVATE -nolibc)
+		target_link_options(${library_lower} PRIVATE -nolibc)
 	endif()
-
-	add_dependencies(libraries-headers ${LIBRARY_LOWER}-headers)
-	add_dependencies(libraries-install ${LIBRARY_LOWER}-install)
 endforeach()
--- a/userspace/libraries/LibC/CMakeLists.txt
+++ b/userspace/libraries/LibC/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libc CXX ASM)
-
 set(LIBC_SOURCES
 	arpa/inet.cpp
 	assert.cpp
@@ -35,34 +31,24 @@ set(LIBC_SOURCES
 	../../../BAN/BAN/Assert.cpp
 )

-add_custom_target(libc-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
-)
-
-add_custom_target(crtx
-	COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/arch/${BANAN_ARCH}/crt0.S -o crt0.o
-	COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/arch/${BANAN_ARCH}/crti.S -o crti.o
-	COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/arch/${BANAN_ARCH}/crtn.S -o crtn.o
-)
-
-add_custom_target(crtx-install
-	COMMAND ${CMAKE_COMMAND} -E copy crt0.o ${BANAN_LIB}/
-	COMMAND ${CMAKE_COMMAND} -E copy crti.o ${BANAN_LIB}/
-	COMMAND ${CMAKE_COMMAND} -E copy crtn.o ${BANAN_LIB}/
-	DEPENDS crtx
-)
-
 add_library(libc ${LIBC_SOURCES})
-add_dependencies(libc headers crtx-install)
-
 target_compile_options(libc PRIVATE -O2 -g -Wstack-usage=512 -fno-tree-loop-distribute-patterns)
 target_compile_options(libc PUBLIC -Wall -Wextra -Werror -Wno-error=stack-usage=)

-add_custom_target(libc-install
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/libc.a ${BANAN_LIB}/
-	DEPENDS libc
-	BYPRODUCTS ${BANAN_LIB}/libc.a
+add_library(crt0 OBJECT arch/${BANAN_ARCH}/crt0.S)
+add_library(crti OBJECT arch/${BANAN_ARCH}/crti.S)
+add_library(crtn OBJECT arch/${BANAN_ARCH}/crtn.S)
+add_custom_target(crtx-install
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_OBJECTS:crt0> ${CMAKE_INSTALL_LIBDIR}/crt0.o
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_OBJECTS:crti> ${CMAKE_INSTALL_LIBDIR}/crti.o
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_OBJECTS:crtn> ${CMAKE_INSTALL_LIBDIR}/crtn.o
+	DEPENDS crt0 crti crtn sysroot
 )

+banan_include_headers(libc ban)
+banan_include_headers(libc kernel)
+
+banan_install_headers(libc)
+install(TARGETS libc)
+
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
--- a/userspace/libraries/LibELF/CMakeLists.txt
+++ b/userspace/libraries/LibELF/CMakeLists.txt
@@ -1,12 +1,8 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(LibELF CXX)
-
-add_custom_target(libelf-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
+set(SOURCES
+	dummy.cpp
 )

-add_custom_target(libelf-install
-	DEPENDS libelf-headers
-)
+add_library(libelf ${SOURCES})
+
+banan_install_headers(libelf)
+install(TARGETS libelf)
--- a/userspace/libraries/LibELF/dummy.cpp
+++ b/userspace/libraries/LibELF/dummy.cpp
--- a/userspace/libraries/LibFont/CMakeLists.txt
+++ b/userspace/libraries/LibFont/CMakeLists.txt
@@ -1,25 +1,13 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libfont CXX)
-
 set(LIBGUI_SOURCES
 	Font.cpp
 	PSF.cpp
 )

-add_custom_target(libfont-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
-)
-
 add_library(libfont ${LIBGUI_SOURCES})
-add_dependencies(libfont headers libc-install)
-target_link_libraries(libfont PUBLIC libc)
+banan_link_library(libfont libc)
+banan_link_library(libfont ban)

-add_custom_target(libfont-install
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/libfont.a ${BANAN_LIB}/
-	DEPENDS libfont
-	BYPRODUCTS ${BANAN_LIB}/libfont.a
-)
+banan_install_headers(libfont)
+install(TARGETS libfont)

 set(CMAKE_STATIC_LIBRARY_PREFIX "")
--- a/userspace/libraries/LibGUI/CMakeLists.txt
+++ b/userspace/libraries/LibGUI/CMakeLists.txt
@@ -1,24 +1,14 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libgui CXX)
-
 set(LIBGUI_SOURCES
 	Window.cpp
 )

-add_custom_target(libgui-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
-)
-
 add_library(libgui ${LIBGUI_SOURCES})
-add_dependencies(libgui headers libc-install)
-target_link_libraries(libgui PUBLIC libc libfont)
+banan_include_headers(libgui ban)
+banan_include_headers(libgui libfont)
+banan_include_headers(libgui libinput)
+banan_link_library(libgui libc)

-add_custom_target(libgui-install
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/libgui.a ${BANAN_LIB}/
-	DEPENDS libgui
-	BYPRODUCTS ${BANAN_LIB}/libgui.a
-)
+banan_install_headers(libgui)
+install(TARGETS libgui)

 set(CMAKE_STATIC_LIBRARY_PREFIX "")
--- a/userspace/libraries/LibImage/CMakeLists.txt
+++ b/userspace/libraries/LibImage/CMakeLists.txt
@@ -1,27 +1,15 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libimage CXX)
-
 set(LIBIMAGE_SOURCES
 	Image.cpp
 	Netbpm.cpp
 	PNG.cpp
 )

-add_custom_target(libimage-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
-)
-
 add_library(libimage ${LIBIMAGE_SOURCES})
-add_dependencies(libimage headers libc-install)
-target_link_libraries(libimage PUBLIC libc)
 target_compile_options(libimage PRIVATE -O3)
+banan_link_library(libimage libc)
+banan_link_library(libimage ban)

-add_custom_target(libimage-install
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/libimage.a ${BANAN_LIB}/
-	DEPENDS libimage
-	BYPRODUCTS ${BANAN_LIB}/libimage.a
-)
+banan_install_headers(libimage)
+install(TARGETS libimage)

 set(CMAKE_STATIC_LIBRARY_PREFIX "")
--- a/userspace/libraries/LibInput/CMakeLists.txt
+++ b/userspace/libraries/LibInput/CMakeLists.txt
@@ -1,24 +1,13 @@
-cmake_minimum_required(VERSION 3.26)
-
-project(libinput CXX)
-
 set(LIBINPUT_SOURCES
 	KeyEvent.cpp
 	KeyboardLayout.cpp
 )

-add_custom_target(libinput-headers
-	COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_CURRENT_SOURCE_DIR}/include/ ${BANAN_INCLUDE}/
-	DEPENDS sysroot
-)
-
 add_library(libinput ${LIBINPUT_SOURCES})
-target_link_libraries(libinput PUBLIC libc ban)
+banan_include_headers(libinput ban)
+banan_link_library(libinput libc)

-add_custom_target(libinput-install
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/libinput.a ${BANAN_LIB}/
-	DEPENDS libinput
-	BYPRODUCTS ${BANAN_LIB}/libinput.a
-)
+banan_install_headers(libinput)
+install(TARGETS libinput)

 set(CMAKE_STATIC_LIBRARY_PREFIX "")