diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f48047c..5ea8c9b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.")
 
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(hal)
 add_subdirectory(contrib)
 
 # The project CMakeLists file has to set the FSFW_CONFIG_PATH and add it.
diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
index 24d7dac3..070b9fbc 100644
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -5,9 +5,7 @@ find_library(LIB_FSFW_NAME fsfw REQUIRED)
 
 option(FSFW_HAL_ADD_LINUX "Add the Linux HAL to the sources. Required gpiod library" OFF)
 option(FSFW_HAL_ADD_RASPBERRY_PI "Add Raspberry Pi specific code to the sources" OFF)
-
 option(FSFW_HAL_ADD_STM32H7 "Add the STM32H7 HAL to the sources" OFF)
-
 option(FSFW_HAL_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON)
 
 set(LIB_FSFW_HAL_NAME fsfw_hal)