Move to CMakepresets

MaJerle · May 17, 2022 · b50391b · b50391b
1 parent 80d91c4
commit b50391b
Show file tree

Hide file tree

Showing 36 changed files with 265 additions and 180 deletions.
diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/c_cpp_properties.json b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/c_cpp_properties.json
@@ -2,6 +2,7 @@
     "version": 4,
     "configurations": [
         {
+            /* ms-vscode.cmake-tools plugin shall to be installed, which provides include paths and defines through CMake file */
             "name": "STM32",
             "includePath": [],
             "defines": [],

diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/cmake-kits.json b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/cmake-kits.json
diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/launch.json b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/launch.json
@@ -8,14 +8,14 @@
             "name": "Debug Microcontroller - ST-Link",
             "cwd": "${workspaceFolder}",
             "type": "cortex-debug",
-            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/project-name.elf
+            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/stm32h735g-dk-led.elf
             "request": "launch",                //Use "attach" to connect to target w/o elf download
             "servertype": "stlink",
-            "device": "STM32F429ZI",            //MCU used
+            "device": "",                       //MCU used, ex. "STM32H735IG"
             "interface": "swd",
             "serialNumber": "",                 //Set ST-Link ID if you use multiple at the same time
             "runToMain": true,
-            "svdFile": "",                      //SVD file to see registers
+            "svdFile": "path/to/file.svd",      //Path to SVD file to see registers
             "v1": false,
             "showDevDebugOutput": true,
 

diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/tasks.json b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/.vscode/tasks.json
@@ -5,7 +5,7 @@
             "type": "cppbuild",
             "label": "Build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -19,7 +19,7 @@
             "type": "shell",
             "label": "Re-build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--clean-first", "-v", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--clean-first", "-v", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -29,24 +29,7 @@
             "type": "shell",
             "label": "Clean project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--target", "clean"],
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "problemMatcher": []
-        },
-        {
-            "type": "shell",
-            "label": "Run CMake configuration",
-            "command": "cmake",
-            "args": [
-                "--no-warn-unused-cli",
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE",
-                "-DCMAKE_BUILD_TYPE:STRING=Debug",
-                "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=gcc-arm-none-eabi.cmake",
-                "-Bbuild",
-                "-G", "Ninja"
-            ],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--target", "clean"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },

diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakeLists.txt b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakeLists.txt
@@ -224,6 +224,7 @@ target_link_options(${EXECUTABLE} PRIVATE
     -T${MCU_LINKER_SCRIPT}${linker_script_SRC}
     ${CPU_PARAMETERS}
     -Wl,-Map=${CMAKE_PROJECT_NAME}.map
+    -u _printf_float              # STDIO float formatting support (remove if not used)
     --specs=nosys.specs
     -Wl,--start-group
     -lc
@@ -244,9 +245,9 @@ add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
     COMMAND ${CMAKE_OBJCOPY} -O ihex $<TARGET_FILE:${EXECUTABLE}> ${EXECUTABLE}.hex
 )
 
-# Conver to bin file -> add conditional check?
+# Convert to bin file -> add conditional check?
 add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
     COMMAND ${CMAKE_OBJCOPY} -O binary $<TARGET_FILE:${EXECUTABLE}> ${EXECUTABLE}.bin
 )
 
-message("Exiting ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
+message("Exiting ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
diff --git a/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakePresets.json b/examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakePresets.json
@@ -0,0 +1,43 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "default",
+            "hidden": true,
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "Debug",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "RelWithDebInfo",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "Release",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "MinSizeRel",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "MinSizeRel"
+            }
+        }
+    ]
+}
diff --git a/...tm32f429zi_nucleo/gcc-arm-none-eabi.cmake → ...29zi_nucleo/cmake/gcc-arm-none-eabi.cmake b/...tm32f429zi_nucleo/gcc-arm-none-eabi.cmake → ...29zi_nucleo/cmake/gcc-arm-none-eabi.cmake
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/c_cpp_properties.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/c_cpp_properties.json
@@ -2,6 +2,7 @@
     "version": 4,
     "configurations": [
         {
+            /* ms-vscode.cmake-tools plugin shall to be installed, which provides include paths and defines through CMake file */
             "name": "STM32",
             "includePath": [],
             "defines": [],

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/cmake-kits.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/cmake-kits.json
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/launch.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/launch.json
@@ -8,14 +8,14 @@
             "name": "Debug Microcontroller - ST-Link",
             "cwd": "${workspaceFolder}",
             "type": "cortex-debug",
-            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/project-name.elf
+            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/stm32h735g-dk-led.elf
             "request": "launch",                //Use "attach" to connect to target w/o elf download
             "servertype": "stlink",
-            "device": "STM32F401RE",            //MCU used
+            "device": "",                       //MCU used, ex. "STM32H735IG"
             "interface": "swd",
             "serialNumber": "",                 //Set ST-Link ID if you use multiple at the same time
             "runToMain": true,
-            "svdFile": "",                      //SVD file to see registers
+            "svdFile": "path/to/file.svd",      //Path to SVD file to see registers
             "v1": false,
             "showDevDebugOutput": true,
 

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/settings.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/settings.json
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/tasks.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/.vscode/tasks.json
@@ -5,7 +5,7 @@
             "type": "cppbuild",
             "label": "Build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -19,7 +19,7 @@
             "type": "shell",
             "label": "Re-build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--clean-first", "-v", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--clean-first", "-v", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -29,24 +29,7 @@
             "type": "shell",
             "label": "Clean project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--target", "clean"],
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "problemMatcher": []
-        },
-        {
-            "type": "shell",
-            "label": "Run CMake configuration",
-            "command": "cmake",
-            "args": [
-                "--no-warn-unused-cli",
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE",
-                "-DCMAKE_BUILD_TYPE:STRING=Debug",
-                "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=gcc-arm-none-eabi.cmake",
-                "-Bbuild",
-                "-G", "Ninja"
-            ],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--target", "clean"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakeLists.txt b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakeLists.txt
@@ -203,6 +203,7 @@ target_link_options(${EXECUTABLE} PRIVATE
     -T${MCU_LINKER_SCRIPT}${linker_script_SRC}
     ${CPU_PARAMETERS}
     -Wl,-Map=${CMAKE_PROJECT_NAME}.map
+    -u _printf_float              # STDIO float formatting support (remove if not used)
     --specs=nosys.specs
     -Wl,--start-group
     -lc
@@ -223,9 +224,9 @@ add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
     COMMAND ${CMAKE_OBJCOPY} -O ihex $<TARGET_FILE:${EXECUTABLE}> ${EXECUTABLE}.hex
 )
 
-# Conver to bin file -> add conditional check?
+# Convert to bin file -> add conditional check?
 add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
     COMMAND ${CMAKE_OBJCOPY} -O binary $<TARGET_FILE:${EXECUTABLE}> ${EXECUTABLE}.bin
 )
 
-message("Exiting ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
+message("Exiting ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakePresets.json b/examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakePresets.json
@@ -0,0 +1,43 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "default",
+            "hidden": true,
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "Debug",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "RelWithDebInfo",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "Release",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "MinSizeRel",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "MinSizeRel"
+            }
+        }
+    ]
+}
diff --git a/...tm32f401re_nucleo/gcc-arm-none-eabi.cmake → ...01re_nucleo/cmake/gcc-arm-none-eabi.cmake b/...tm32f401re_nucleo/gcc-arm-none-eabi.cmake → ...01re_nucleo/cmake/gcc-arm-none-eabi.cmake
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/c_cpp_properties.json b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/c_cpp_properties.json
@@ -2,6 +2,7 @@
     "version": 4,
     "configurations": [
         {
+            /* ms-vscode.cmake-tools plugin shall to be installed, which provides include paths and defines through CMake file */
             "name": "STM32",
             "includePath": [],
             "defines": [],

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/cmake-kits.json b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/cmake-kits.json
diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/launch.json b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/launch.json
@@ -8,14 +8,14 @@
             "name": "Debug Microcontroller - ST-Link",
             "cwd": "${workspaceFolder}",
             "type": "cortex-debug",
-            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/project-name.elf
+            "executable": "${command:cmake.launchTargetPath}", //or fixed file path: build/stm32h735g-dk-led.elf
             "request": "launch",                //Use "attach" to connect to target w/o elf download
             "servertype": "stlink",
-            "device": "STM32F429ZI",            //MCU used
+            "device": "",                       //MCU used, ex. "STM32H735IG"
             "interface": "swd",
             "serialNumber": "",                 //Set ST-Link ID if you use multiple at the same time
             "runToMain": true,
-            "svdFile": "",                      //SVD file to see registers
+            "svdFile": "path/to/file.svd",      //Path to SVD file to see registers
             "v1": false,
             "showDevDebugOutput": true,
 

diff --git a/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/tasks.json b/examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/.vscode/tasks.json
@@ -5,7 +5,7 @@
             "type": "cppbuild",
             "label": "Build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -19,7 +19,7 @@
             "type": "shell",
             "label": "Re-build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--clean-first", "-v", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--clean-first", "-v", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -29,24 +29,7 @@
             "type": "shell",
             "label": "Clean project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--target", "clean"],
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "problemMatcher": []
-        },
-        {
-            "type": "shell",
-            "label": "Run CMake configuration",
-            "command": "cmake",
-            "args": [
-                "--no-warn-unused-cli",
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE",
-                "-DCMAKE_BUILD_TYPE:STRING=Debug",
-                "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=gcc-arm-none-eabi.cmake",
-                "-Bbuild",
-                "-G", "Ninja"
-            ],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--target", "clean"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },