Upgrading to NCS V2.2.0

[Mike Austin (LPI)]

I'm in the process of upgrading my NCS from V2.0.0 to V2.2.0, but am noticing that many of my #include's from code that built OK on v2.0.0 aren't being found in v2.2.0.

I'm guessing there is some setting I need to add/change to make things work, but I've no idea where to start looking.

The following shows some of the includes I've had to modify to get things to build correctly.  Is this strictly necessary?  Or can I address all of this with a suitable inclusion/change in my CMakeLists.txt file

<zephyr.h> change to <zephyr/kernel.h>
<sys/printk.h> change to <zephyr/sys/printk.h>
<device.h> change to <zephyr/device.h>
<drivers/i2c.h>  change to <zephyr/drivers/i2c.h>
<bluetooth/gatt.h> change to <zephyr/bluetooth/gatt.h>
<bluetooth/uuid.h> change to <zephyr/bluetooth/uuid.h>
<bluetooth/bluetooth.h> change to <zephyr/bluetooth/bluetooth.h>
<bluetooth/hci.h> change to <zephyr/bluetooth/hci.h>
<bluetooth/conn.h> change to <zephyr/bluetooth/conn.h>

This is my CMakeLists.txt file as it stands currently:

# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.20.0)

find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

project(LSR-MAX)

# Source Files
FILE(GLOB app_sources src/*.c src/*.h)
target_sources(app PRIVATE ${app_sources})
zephyr_include_directories(src)

#zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth)
zephyr_library_include_directories(${ZEPHYR_BASE})

Thanks,

Mike

[Susheel Nuguru]

Hi Mike,

The samples we have in our SDK have the includes added properly to the build structure and when building manually or using Visual Studio Code you find that all samples builds properly. But if you have structured your project differently or building it in a different way or pulled in some other dependencies into the project to add new features, then it is normal that we need to add those dependencies into the CMakeLists.txt file. 

So, your changes in the CMakeLists.txt file should have been pulled by the KConfig inclusion of those modules you tried to pull in your proj.conf file. Can you attach your project here so that I can quickly check if you pulled in your new dependencies in the right way into the proj.conf?

[Mike Austin (LPI)]

Hi Susheel,

Attached is a simple project that shows the behaviour I am referring to.5504.littlefs_example.zip

When I build this under V2.0.0, it completes without errors.  But if I try and build under V2.2.0, then I need to add "zephyr/" to most of the includes in order for them to get picked up correctly

Regards,

Mike

[Susheel Nuguru]

Thanks for the project Mike, I will give it a try and let you know my observations on it.

[Mike Austin (LPI)]

Hi Susheel,

I just noticed this on the GitHub repo for sdk-nrf:

This is basically what I'm seeing, so I'm assuming its a zephyr thing that now requires <zephyr/...> to be added to all the zephyr based includes

Regards,

Mike

[Susheel Nuguru]

Seems like it. Greate find Mike. This will be useful info as it is easy to miss.