Skip to content

Internal evercbor #7524

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

Open
maxtropets wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Internal evercbor #7524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa1bc5c
Internal evercbor
maxtropets Dec 11, 2025
e57265b
Merge branch 'main' into f/ever-cbor-internal
maxtropets Dec 11, 2025
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
0 3rdparty/exported/evercbor/CBORNondet.c → 3rdparty/internal/evercbor/CBORNondet.c
View file
Open in desktop
File renamed without changes.
0 3rdparty/exported/evercbor/CBORNondet.h → 3rdparty/internal/evercbor/CBORNondet.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/exported/evercbor/CBORNondetType.h → 3rdparty/internal/evercbor/CBORNondetType.h
View file
Open in desktop
File renamed without changes.
0 ...y/exported/evercbor/internal/CBORNondet.h → ...y/internal/evercbor/internal/CBORNondet.h
View file
Open in desktop
File renamed without changes.
0 3rdparty/exported/evercbor/krmllib.h → 3rdparty/internal/evercbor/krmllib.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions cmake/evercbor.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# Licensed under the Apache 2.0 License.

# Build EverCBOR
set(EVERCBOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/exported/evercbor")
set(EVERCBOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/internal/evercbor")
set(EVERCBOR_SRCS "${EVERCBOR_DIR}/CBORNondet.c")

add_library(evercbor STATIC ${EVERCBOR_SRCS})

target_include_directories(
evercbor PUBLIC $<BUILD_INTERFACE:${CCF_3RD_PARTY_EXPORTED_DIR}/evercbor>
evercbor PUBLIC $<BUILD_INTERFACE:${CCF_3RD_PARTY_INTERNAL_DIR}/evercbor>
Copy link
Member

@achamayou achamayou Dec 11, 2025

Choose a reason for hiding this comment

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

I don't think this is right, I think the target_include_directories should be PRIVATE instead, and probably not refer to the install interface, since the point of moving from external to internal is to not export these headers.

For this to work, we need to make sure that none of the headers we export in include/ccf include headers from evercbor. I do not know if that is (already) the case.

Copy link
Collaborator Author

@maxtropets maxtropets Dec 11, 2025

Choose a reason for hiding this comment

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

This PR simply moves it from exported to internal to avoid them being packaged

Copy link
Member

@achamayou achamayou Dec 11, 2025

Choose a reason for hiding this comment

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

but we still export the include directory as a public dependency, so that seems like a breaking change

$<INSTALL_INTERFACE:include/3rdparty/evercbor>
)
set_property(TARGET evercbor PROPERTY POSITION_INDEPENDENT_CODE ON)
Expand Down