Skip to content

CMake cryptocell: fix include path #13441

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 17, 2020
Merged

CMake cryptocell: fix include path #13441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ target_include_directories(mbed-os
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310
${CMAKE_CURRENT_SOURCE_DIR}/include/internal
${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310/internal
Copy link
Collaborator

Choose a reason for hiding this comment

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

I have seen header files included with paths starting a number of directories before the file is. To make sure all is covered, I include all directories.
So I would have:

Suggested change
${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310/internal
${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310
${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310/internal

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct, fixing now, also internal should be private

Copy link
Collaborator

@hugueskamba hugueskamba Aug 17, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

There are a number of dirs that should be private. However, I thought we should do it once we start breaking down the library into small components.
It's fine if you do it now but I thought it could be done then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we will need to clean it. I put it back as it failed, investigating

)

target_sources(mbed-os
Expand Down