Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: prototyping support for CMake presets json file. #3979

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions applications/asset_tracker/CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1,
"cmakeMinimumRequired": {
"major": 3,
"minor": 19,
"patch": 0
Comment on lines +2 to +6

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I can advise from my experience with presets is to use possibly the newest Preset manifest version.
Looks like presets for CMake configure, build and test steps were added as separate steps in CMake v3.20.0 (manifest ver 2.0). Features grow very dynamically and we will need them to group configurations using inheritance successfully. Zephyr minimal Cmake is 3.20.0 as far as I remember?

},
"configurePresets": [
{
"name": "default",
"displayName": "Asset Tracker build (prj.conf)",
"description": "Asset Tracker build",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"NCS_TOOLCHAIN_VERSION": {
"type": "STRING",
"value": "1.5.0"
}
}
},
{
"name": "test",
"inherits": "default",
"displayName": "Asset Tracker Test build (prj_test.conf)",
"description": "Asset Tracker Test build",
"cacheVariables": {
"CONF_FILE": {
"type": "STRING",
"value": "prj_test.conf"
}
}
}
],
"vendor": {
"zephyr": {
"twister": {
"sample": {
"name": "Asset Tracker Application"
},
"tests": {
"applications.asset_tracker": {
"build_only": true,
"build_on_all": true,
"platform_allow": "nrf9160dk_nrf9160ns thingy91_nrf9160ns qemu_x86",
"tags": "ci_build"
}
}
}
}
}
}
8 changes: 0 additions & 8 deletions applications/asset_tracker/sample.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 7598e62f2e1a64191281f137ec553ed3017f1100
revision: pull/469/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down