Move to vanilla Mbed OS CMake + Distro Fix

.editorconfig

@@ -37,3 +37,7 @@ indent_size = 4
 [.ycm_extra_conf.py]
 indent_style = space
 indent_size = 2
+
+[extern/mbed-os/**]
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitignore

@@ -6,7 +6,9 @@
 extern/mbed-os
 _build*
 _coverage*
+cmake_build
 cmake/config/
+.mbedbuild
 .cache
 .clangd
 *.ioc.csv

CMakeLists.txt

@@ -2,7 +2,6 @@
 # Copyright 2020 Ladislas de Toldi (ladislas [at] detoldi.me)
 # SPDX-License-Identifier: Apache-2.0
 
-# mbed-cmake requires at least CMake 3.18
 cmake_minimum_required(VERSION 3.19)
 
 # Activate ccache
@@ -12,38 +11,42 @@ if(CCACHE)
     set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
 endif()
 
-# 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 ROOT_DIR, MBED_PATH, MBED_CONFIG_PATH
+set(ROOT_DIR         ${CMAKE_CURRENT_LIST_DIR})
+set(MBED_PATH        ${ROOT_DIR}/extern/mbed-os CACHE INTERNAL "")
+set(MBED_CONFIG_PATH ${ROOT_DIR}/.mbedbuild CACHE INTERNAL "")
 
-# And include mbed-cmake.cmake
-include(./mbed-cmake.cmake)
-
-# Then configure name of the project
-project("Mbed CMake Template" LANGUAGES C CXX ASM)
+# For convenience, define useful variables
+set(LIBS_DIR    ${ROOT_DIR}/libs)
+set(SPIKES_DIR  ${ROOT_DIR}/spikes)
+set(TARGETS_DIR ${ROOT_DIR}/targets)
 
 # Generate compile commands database
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 
-# For convenience you can define useful variables
-set(LIBS_DIR ${ROOT_DIR}/libs)
-set(SPIKES_DIR ${ROOT_DIR}/spikes)
-set(TARGETS_DIR ${ROOT_DIR}/targets)
+# Include mbed os cmake logic
+include(${MBED_PATH}/tools/cmake/app.cmake)
 
-# Add custom target subdirectory
-set(AVAILABLE_CUSTOM_TARGETS DISCO_ORIGINAL LEKA_V1_0_DEV LEKA_V1_1_DEV LEKA_V1_2_DEV)
-if (${TARGET_BOARD} IN_LIST AVAILABLE_CUSTOM_TARGETS)
-	add_subdirectory(${TARGETS_DIR}/TARGET_${TARGET_BOARD})
-endif()
+# Colored output when compiling
+add_compile_options(-fdiagnostics-color)
+
+# 💡 Set project name and languages
+project("Mbed CMake Template" LANGUAGES C CXX ASM)
+
+# Add mbed-os
+add_subdirectory(${MBED_PATH})
+include(${ROOT_DIR}/cmake/mbed_create_distro.cmake)
+mbed_create_distro(mbed_for_my_app mbed-os)
 
 # Add libraries
 add_subdirectory(${LIBS_DIR}/HelloWorld)
 
-# If you use spikes to test features, you can add them here
-add_subdirectory(${SPIKES_DIR}/blinky)
-
-# Add the main source files of the project from ./src
+# Add executable targets main & blinky (as spike)
+# 💡 You can uncomment both lines to make it fail
 add_subdirectory(${ROOT_DIR}/src)
+add_subdirectory(${SPIKES_DIR}/blinky)
 
-# Finally print the mbed-cmake build report
-mbed_cmake_print_build_report()
+option(VERBOSE_BUILD "Have a verbose build process")
+if(VERBOSE_BUILD)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()

Makefile

@@ -77,13 +77,13 @@ clean_config:
 
 config_target: mkdir_config
 	@echo ""
-	@echo "🏃 Running configuration script for target $(TARGET_BOARD) 📝"
-	python3 $(CMAKE_DIR)/scripts/configure_cmake_for_target.py $(TARGET_BOARD) -p $(PROJECT_BUILD_DIR)/cmake_config/$(TARGET_BOARD) -a $(ROOT_DIR)/mbed_app.json
+	@echo "🏃 Running target configuration script 📝"
+	mbed-tools configure -t GCC_ARM -m $(TARGET_BOARD) --mbed-os-path=./extern/mbed-os
 
 config_cmake: mkdir_build
 	@echo ""
 	@echo "🏃 Running cmake configuration script for target $(TARGET_BOARD) 📝"
-	@cmake -S . -B $(TARGET_BUILD_DIR) -GNinja -DTARGET_BOARD="$(TARGET_BOARD)" -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_CODE_ANALYSIS=$(CODE_ANALYSIS)
+	@cmake -S . -B $(TARGET_BUILD_DIR) -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
 
 #
 # MARK: - Tests targets
@@ -176,7 +176,6 @@ mbed_clone:
 	@echo "🧬 Cloning Mbed OS 📦"
 	@rm -rf $(MBED_OS_DIR)
 	git clone --depth=1 --branch=$(BRANCH) https://github.com/ARMmbed/mbed-os $(MBED_OS_DIR)
-	@$(MAKE) mbed_symlink_files
 
 mbed_curl:
 	@echo ""
@@ -186,7 +185,6 @@ mbed_curl:
 	curl -O -L https://github.com/ARMmbed/mbed-os/archive/$(VERSION).tar.gz
 	tar -xzf $(VERSION).tar.gz --strip-components=1 -C extern/mbed-os
 	rm -rf $(VERSION).tar.gz
-	@$(MAKE) mbed_symlink_files
 
 mbed_symlink_files:
 	@echo ""

README.md

@@ -1,5 +1,39 @@
 # Mbed CMake Template
 
+## 🚧 WIP - From USCRPL/mbed-cmake to Mbed OS first-party CMake
+
+> ⚠️⚠️⚠️
+
+This branch is a WIP to move from USCRPL/mbed-cmake to Mbed OS first-party CMake.
+
+### Instructions
+
+```shell
+# Clone repository & switch branch
+git clone https://github.com/ladislas/mbed-cmake-template
+cd mbed-cmake-template
+git checkout feature/move-to-vanilla-cmake
+
+# Clone mbed-os in `./extern/mbed-os`
+# You can select the branch or tag you want
+git clone --depth=10 --branch=master https://github.com/ARMmbed/mbed-os ./extern/mbed-os
+
+# Config CMake
+make config
+
+# Build the project
+make
+```
+
+Please note:
+
+- there is no need to run `mbed-tools configure... `, `.mbedbuild` is included in the repository for `DISCO_F769NI`
+- `make config` runs `make clean` before configuring CMake
+- To chekcout a different branch in `mbed-os`, `cd ./extern/mbed-os` and then `git checkout` or `gh pr checkout {pr_number}`
+- To test two `add_executable` targets, you can uncomment line 29-30 from the main `CMakeLists.txt`
+
+> ⚠️⚠️⚠️
+
 **Version: 1.0.0**
 
 ## Introduction