ladislas/feature/clean up cmake

.github/actions/setup/action.yml

@@ -88,7 +88,14 @@ runs:
         path: |
           extern/mbed-os
           extern/mcuboot
-        key: ${{ runner.os }}-global_cache-extern_dependencies-${{ hashFiles('.mbed_version', '.mbed_git_url', '.mcuboot_version') }}
+        key: ${{ runner.os }}-global_cache-extern_dependencies-${{ hashFiles('.mbed_version', '.mbed_git_url', '.mcuboot_version', 'cmake/templates/**') }}
+
+    - name: Pull extern dependencies
+      if: steps.global_cache-extern_dependencies.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        make mbed_curl
+        make mcuboot_clone
 
     - name: Cache ccache
       id: global_cache-ccache
@@ -133,14 +140,3 @@ runs:
         mbed-cli --help
         mbed-tools --help
         imgtool --help
-
-    #
-    # Mark: - Extern dependencies
-    #
-
-    - name: Pull extern dependencies
-      if: steps.global_cache-extern_dependencies.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        make mbed_curl
-        make mcuboot_clone

.github/workflows/ci-code_analysis-compare_bin_map_files.yml

@@ -32,6 +32,7 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Setup CI
+        id: setup_ci
         uses: ./.github/actions/setup
         with:
           ccache_name: code_analysis-compare_files
@@ -44,9 +45,8 @@ jobs:
         run: |
           git checkout ${{ env.BASE_REF }}
           make deep_clean
-          if [[ "$BASE_MBED_VERSION" != "$HEAD_MBED_VERSION" ]]; then
-            make mbed_curl VERSION=${{ env.BASE_MBED_VERSION }}
-          fi
+          make mbed_curl VERSION=${{ env.BASE_MBED_VERSION }}
+          make mcuboot_clone
           make config ${{ matrix.enable_log_debug }}
           make
 
@@ -61,9 +61,8 @@ jobs:
         run: |
           git checkout ${{ env.HEAD_REF }}
           make deep_clean
-          if [[ "$BASE_MBED_VERSION" != "$HEAD_MBED_VERSION" ]]; then
-            make mbed_curl VERSION=${{ env.HEAD_MBED_VERSION }}
-          fi
+          make mbed_curl VERSION=${{ env.HEAD_MBED_VERSION }}
+          make mcuboot_clone
           make config ${{ matrix.enable_log_debug }}
           make
 

.vscode/settings.json

@@ -71,12 +71,20 @@
 		".cache": true,
 		".clangd": true
 	},
+	"cmake.ignoreKitEnv": true,
+	"cmake.configureOnOpen": true,
 	"cmake.buildDirectory": "${workspaceFolder}/_build_cmake_tools",
+	"cmake.mergedCompileCommands": "${workspaceFolder}/compile_commands.json",
 	"cmake.configureArgs": [
-		"-DTARGET_BOARD=LEKA_V1_2_DEV",
-		"-DENABLE_LOG_DEBUG=ON",
-		"-DCMAKE_CONFIG_DIR=${workspaceFolder}/_build_cmake_tools/cmake_config"
+		"-GNinja",
 	],
+	"cmake.configureSettings": {
+		"TARGET_BOARD": "LEKA_V1_2_DEV",
+		"ENABLE_LOG_DEBUG": "ON",
+		"MBED_PATH": "${workspaceFolder}/extern/mbed-os",
+		"CMAKE_CONFIG_DIR": "${workspaceFolder}/_build_cmake_tools/cmake_config",
+		"CMAKE_BUILD_TYPE": "Debug"
+	},
 	"markdownlint.config": {
 		"MD002": false,
 		"MD007": {
@@ -91,7 +99,6 @@
 		"MD033": false
 	},
 	"editor.formatOnSave": true,
-	"cmake.configureOnOpen": true,
 	"clangd.checkUpdates": true,
 	"clangd.arguments": [
 		"--query-driver=/usr/local/bin/arm-none-eabi*",

CMakeLists.txt

@@ -4,98 +4,102 @@
 
 cmake_minimum_required(VERSION 3.21)
 
-# Activate ccache if available
+#
+# MARK: - External tools
+#
+
 find_program(CCACHE "ccache")
 if(CCACHE)
 	set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE}")
 	set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE}")
 endif(CCACHE)
 
-# Activate code analysis
-option(ENABLE_CODE_ANALYSIS "Run code analysis" OFF)
-message(STATUS "ENABLE_CODE_ANALYSIS --> ${ENABLE_CODE_ANALYSIS}")
-
-if(ENABLE_CODE_ANALYSIS)
-	find_program(CPPCHECK "cppcheck")
-	if(CPPCHECK)
-		set(CMAKE_CXX_CPPCHECK "${CPPCHECK}"
-			"--platform=${CMAKE_CURRENT_SOURCE_DIR}/tools/config/cppcheck_leka_platform.xml"
-			"--std=c++17"
-			"--cppcheck-build-dir=build/cppcheck"
-			"--enable=all"
-			"--inconclusive"
-			"--inline-suppr"
-			"--quiet"
-			"--suppress=unmatchedSuppression"
-			"--suppress=missingIncludeSystem"
-			"--suppress=*:*extern/mbed-os\*"
-			"--template=🔥 warning: {id} ({severity}): {message}\\n    in {file}:{line}\\n{code}"
-			# "--check-config"
-		)
-	endif(CPPCHECK)
-endif(ENABLE_CODE_ANALYSIS)
-
-# Activate LogKit
-option(ENABLE_LOG_DEBUG "Enable LogKit output" OFF)
-message(STATUS "ENABLE_LOG_DEBUG --> ${ENABLE_LOG_DEBUG}")
-if(ENABLE_LOG_DEBUG)
-	add_definitions(-DENABLE_LOG_DEBUG)
-endif(ENABLE_LOG_DEBUG)
+# Compile commands database
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
+if(CMAKE_EXPORT_COMPILE_COMMANDS)
+	set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
+endif()
+
+#
+# MARK: - Compilation flags/options
+#
 
 # Set C/C++ standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS TRUE)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_C_EXTENSIONS TRUE)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 
 # Add custom flags
 add_compile_options(
+	$<$<COMPILE_LANGUAGE:CXX>:-Wno-register>
+	$<$<COMPILE_LANGUAGE:CXX>:-Wno-volatile>
 	-fdiagnostics-color=always
 )
 
-# Before all, set ROOT_DIR, MBED_OS_DIR
-set(ROOT_DIR      ${CMAKE_CURRENT_LIST_DIR})
-set(MBED_OS_DIR   ${ROOT_DIR}/extern/mbed-os)
-set(MCUBOOT_DIR   ${ROOT_DIR}/extern/mcuboot/boot)
-set(MBED_HTTP_DIR ${ROOT_DIR}/extern/mbed-http)
-
-# Bootloader option
+# Bootloader
 option(BUILD_TARGETS_TO_USE_WITH_BOOTLOADER "Build targets with padding to use with bootloader" OFF)
-message(STATUS "Build targets with padding to use with bootloader --> ${BUILD_TARGETS_TO_USE_WITH_BOOTLOADER}")
 if (BUILD_TARGETS_TO_USE_WITH_BOOTLOADER)
 	set(MBED_APP_FLAGS
 		-DMBED_APP_START=0x08041000
 		-DMBED_APP_SIZE=0x17E000
 	)
 endif(BUILD_TARGETS_TO_USE_WITH_BOOTLOADER)
 
-# And include mbed-cmake.cmake
-include(./mbed-cmake.cmake)
+# Logger
+option(ENABLE_LOG_DEBUG "Enable LogKit output" OFF)
+if(ENABLE_LOG_DEBUG)
+	add_definitions(-DENABLE_LOG_DEBUG)
+endif(ENABLE_LOG_DEBUG)
 
-# Then configure name of the project
-project(LekaOS LANGUAGES C CXX ASM)
 
-# Generate compile commands database
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
+#
+# MARK: - Directories
+#
 
-if(CMAKE_EXPORT_COMPILE_COMMANDS)
-	set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
-endif()
+# Before all
+set(ROOT_DIR      ${CMAKE_CURRENT_LIST_DIR})
+
+# extern
+set(MBED_OS_DIR   ${ROOT_DIR}/extern/mbed-os)
+set(MCUBOOT_DIR   ${ROOT_DIR}/extern/mcuboot/boot)
+set(MBED_HTTP_DIR ${ROOT_DIR}/extern/mbed-http)
+
+# includes
+set(LIBS_DIR    ${ROOT_DIR}/libs)
+set(DRIVERS_DIR ${ROOT_DIR}/drivers)
+set(INCLUDE_DIR ${ROOT_DIR}/include)
+set(TARGETS_DIR ${ROOT_DIR}/targets)
 
-# For convenience you can define useful variables
+# app
 set(OS_DIR         ${ROOT_DIR}/app/os)
-set(LIBS_DIR       ${ROOT_DIR}/libs)
-set(TESTS_DIR      ${ROOT_DIR}/tests)
-set(SPIKES_DIR     ${ROOT_DIR}/spikes)
-set(DRIVERS_DIR    ${ROOT_DIR}/drivers)
-set(TARGETS_DIR    ${ROOT_DIR}/targets)
-set(INCLUDE_DIR    ${ROOT_DIR}/include)
 set(BOOTLOADER_DIR ${ROOT_DIR}/app/bootloader)
 
+# spikes, functional tests
+set(SPIKES_DIR           ${ROOT_DIR}/spikes)
+set(FUNCTIONAL_TESTS_DIR ${ROOT_DIR}/tests/functional)
+
+#
+# MARK: - LekaOS Project
+#
+
+# And include mbed-cmake.cmake
+include(${ROOT_DIR}/mbed-cmake.cmake)
+
+project(LekaOS LANGUAGES C CXX ASM)
+
 # Add custom target subdirectory
-set(AVAILABLE_CUSTOM_TARGETS DISCO_ORIGINAL LEKA_V1_0_DEV LEKA_V1_1_DEV LEKA_V1_2_DEV)
+set(AVAILABLE_CUSTOM_TARGETS LEKA_DISCO LEKA_V1_2_DEV)
 if (${TARGET_BOARD} IN_LIST AVAILABLE_CUSTOM_TARGETS)
+	message(STATUS "Add subdirectory for hardware target ${TARGET_BOARD}")
 	add_subdirectory(${TARGETS_DIR}/TARGET_${TARGET_BOARD})
+else()
+	message(FATAL_ERROR "Target ${TARGET_BOARD} is not available.")
 endif()
 
 include_directories(BEFORE
@@ -115,13 +119,6 @@ link_libraries(
 	CriticalSection
 )
 
-# Add external libraries
-add_compile_definitions(MCUBOOT_BOOTLOADER_SIZE=0x40000)
-add_compile_definitions(MCUBOOT_SCRATCH_SIZE=0x40000)
-add_compile_definitions(MCUBOOT_SCRATCH_START_ADDR=0x081C0000)
-add_compile_definitions(MCUBOOT_RSA_SIGNATURE_LENGTH=2048)
-add_compile_definitions(MCUBOOT_SLOT_SIZE=0x200000-MCUBOOT_BOOTLOADER_SIZE-MCUBOOT_SCRATCH_SIZE)
-
 add_subdirectory(${MCUBOOT_DIR})
 add_subdirectory(${MBED_HTTP_DIR})
 
@@ -131,7 +128,7 @@ add_subdirectory(${LIBS_DIR})
 
 # Add spikes, functional tests
 add_subdirectory(${SPIKES_DIR})
-add_subdirectory(${TESTS_DIR}/functional)
+add_subdirectory(${FUNCTIONAL_TESTS_DIR})
 
 # Add bootloader
 add_subdirectory(${BOOTLOADER_DIR})
@@ -141,3 +138,20 @@ add_subdirectory(${OS_DIR})
 
 # Finally print the mbed-cmake build report
 mbed_cmake_print_build_report()
+
+#
+# MARK: - Misc. options
+#
+
+option(VERBOSE_BUILD "Have a verbose build process")
+if(VERBOSE_BUILD)
+	set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()
+
+# Print options
+message(STATUS "")
+message(STATUS "CMAKE_EXPORT_COMPILE_COMMANDS --> ${CMAKE_EXPORT_COMPILE_COMMANDS}")
+message(STATUS "ENABLE_LOG_DEBUG              --> ${ENABLE_LOG_DEBUG}")
+message(STATUS "BUILD_TARGETS_FOR_BOOTLOADER  --> ${BUILD_TARGETS_TO_USE_WITH_BOOTLOADER}")
+message(STATUS "CMAKE_VERBOSE_MAKEFILE        --> ${VERBOSE_BUILD}")
+message(STATUS "")