Skip to content

Commit

Permalink
Improve cmake projects
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaJerle
MaJerle committed Aug 1, 2022
1 parent 32a9530 commit 077c829
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 190 deletions.
0 ...29zi_nucleo/cmake/gcc-arm-none-eabi.cmake → cmake/gcc-arm-none-eabi.cmake
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
# Core project settings
#
set(PROJ_PATH ${CMAKE_CURRENT_SOURCE_DIR})
project(lwow_stm32f429zi_nucleo_ds18b20_multi_rtos)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
project(${PROJECT_NAME})
enable_language(C CXX ASM)
message("Build type: " ${CMAKE_BUILD_TYPE})

Expand Down
27 changes: 6 additions & 21 deletions examples/stm32/ow_ds18b20_multi_rtos_stm32f429zi_nucleo/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
"toolchainFile": "${sourceDir}/../../../cmake/gcc-arm-none-eabi.cmake",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
Expand All @@ -17,27 +17,12 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "RelWithDebInfo",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
}
],
"buildPresets": [
{
"name": "MinSizeRel",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
"name": "Debug",
"configurePreset": "Debug"
}
]
}
4 changes: 3 additions & 1 deletion examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
# Core project settings
#
set(PROJ_PATH ${CMAKE_CURRENT_SOURCE_DIR})
project(lwow_stm32f401re_nucleo_ds18b20_rtos)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
project(${PROJECT_NAME})
enable_language(C CXX ASM)
message("Build type: " ${CMAKE_BUILD_TYPE})

Expand Down
27 changes: 6 additions & 21 deletions examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
"toolchainFile": "${sourceDir}/../../../cmake/gcc-arm-none-eabi.cmake",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
Expand All @@ -17,27 +17,12 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "RelWithDebInfo",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
}
],
"buildPresets": [
{
"name": "MinSizeRel",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
"name": "Debug",
"configurePreset": "Debug"
}
]
}
20 changes: 0 additions & 20 deletions examples/stm32/ow_ds18b20_rtos_stm32f401re_nucleo/cmake/gcc-arm-none-eabi.cmake
View file

This file was deleted.

4 changes: 3 additions & 1 deletion examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
# Core project settings
#
set(PROJ_PATH ${CMAKE_CURRENT_SOURCE_DIR})
project(lwow_stm32f429zi_nucleo_ds18b20_rtos)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
project(${PROJECT_NAME})
enable_language(C CXX ASM)
message("Build type: " ${CMAKE_BUILD_TYPE})

Expand Down
27 changes: 6 additions & 21 deletions examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
"toolchainFile": "${sourceDir}/../../../cmake/gcc-arm-none-eabi.cmake",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
Expand All @@ -17,27 +17,12 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "RelWithDebInfo",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
}
],
"buildPresets": [
{
"name": "MinSizeRel",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
"name": "Debug",
"configurePreset": "Debug"
}
]
}
20 changes: 0 additions & 20 deletions examples/stm32/ow_ds18b20_rtos_stm32f429zi_nucleo/cmake/gcc-arm-none-eabi.cmake
View file

This file was deleted.

4 changes: 3 additions & 1 deletion examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
# Core project settings
#
set(PROJ_PATH ${CMAKE_CURRENT_SOURCE_DIR})
project(lwow_stm32l496g_discovery_ds18b20_rtos)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
project(${PROJECT_NAME})
enable_language(C CXX ASM)
message("Build type: " ${CMAKE_BUILD_TYPE})

Expand Down
27 changes: 6 additions & 21 deletions examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
"toolchainFile": "${sourceDir}/../../../cmake/gcc-arm-none-eabi.cmake",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
Expand All @@ -17,27 +17,12 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "RelWithDebInfo",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
}
],
"buildPresets": [
{
"name": "MinSizeRel",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
"name": "Debug",
"configurePreset": "Debug"
}
]
}
20 changes: 0 additions & 20 deletions examples/stm32/ow_ds18b20_rtos_stm32l496g_discovery/cmake/gcc-arm-none-eabi.cmake
View file

This file was deleted.

4 changes: 3 additions & 1 deletion examples/stm32/ow_ds18b20_stm32l496g_discovery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
# Core project settings
#
set(PROJ_PATH ${CMAKE_CURRENT_SOURCE_DIR})
project(lwow_stm32l496g_discovery_ds18b20)
get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
project(${PROJECT_NAME})
enable_language(C CXX ASM)
message("Build type: " ${CMAKE_BUILD_TYPE})

Expand Down
27 changes: 6 additions & 21 deletions examples/stm32/ow_ds18b20_stm32l496g_discovery/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"toolchainFile": "${sourceDir}/cmake/gcc-arm-none-eabi.cmake",
"toolchainFile": "${sourceDir}/../../../cmake/gcc-arm-none-eabi.cmake",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
Expand All @@ -17,27 +17,12 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "RelWithDebInfo",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "Release",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
}
],
"buildPresets": [
{
"name": "MinSizeRel",
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel"
}
"name": "Debug",
"configurePreset": "Debug"
}
]
}
20 changes: 0 additions & 20 deletions examples/stm32/ow_ds18b20_stm32l496g_discovery/cmake/gcc-arm-none-eabi.cmake
View file

This file was deleted.

0 comments on commit 077c829

Please sign in to comment.