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.

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

Jump to bottom

Fix cmake install for shared_ptr headers #12194

Merged
merged 2 commits into from
May 23, 2024
Merged

Fix cmake install for shared_ptr headers #12194

merged 2 commits into from
May 23, 2024

Conversation

carlopi
Copy link
Contributor

@carlopi carlopi commented May 22, 2024 •
edited
Loading

Moving implementation files to have .hpp postfix, and adding a test checking on installing the wrong set of header files.

Test only without the commit with the fix is here: https://github.com/carlopi/duckdb/actions/runs/9195876475/job/25292659806
This did indeed fail with:

2024-05-22T18:06:13.0895811Z In file included from /usr/local/include/duckdb/common/helper.hpp:12,
2024-05-22T18:06:13.0897014Z                  from /usr/local/include/duckdb/common/common.hpp:12,
2024-05-22T18:06:13.0898136Z                  from /usr/local/include/duckdb/catalog/catalog_entry.hpp:11,
2024-05-22T18:06:13.0899289Z                  from /usr/local/include/duckdb/catalog/catalog.hpp:11,
2024-05-22T18:06:13.0900109Z                  from /usr/local/include/duckdb/common/serializer/write_stream.hpp:11,
2024-05-22T18:06:13.0901011Z                  from /usr/local/include/duckdb/common/serializer/buffered_file_writer.hpp:11,
2024-05-22T18:06:13.0901789Z                  from /usr/local/include/duckdb/main/connection.hpp:12,
2024-05-22T18:06:13.0902345Z                  from /usr/local/include/duckdb.hpp:11,
2024-05-22T18:06:13.0903019Z                  from examples/embedded-c++/main.cpp:1:
2024-05-22T18:06:13.0903981Z /usr/local/include/duckdb/common/shared_ptr.hpp:40:10: fatal error: duckdb/common/shared_ptr.ipp: No such file or directory
2024-05-22T18:06:13.0904928Z    40 | #include "duckdb/common/shared_ptr.ipp"
2024-05-22T18:06:13.0905398Z       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Alternative implementations also are possible, but I think this is logically the simpler (also to review)

@carlopi carlopi force-pushed the fix_hpp_install branch from 7f6517b to e8b0a6b Compare May 22, 2024 17:41
@duckdb-draftbot duckdb-draftbot marked this pull request as draft May 22, 2024 17:42
@carlopi carlopi marked this pull request as ready for review May 22, 2024 17:42
@Mytherin Mytherin merged commit 3f97165 into duckdb:main May 23, 2024
44 checks passed
@Mytherin
Copy link
Collaborator

Thanks!

This was referenced May 23, 2024
Closed
Merged
github-actions bot pushed a commit to duckdb/duckdb-r that referenced this pull request Jun 5, 2024
@krlmlr
chore: Update vendored sources to duckdb/duckdb@3f97165
294284f 
Merge pull request duckdb/duckdb#12194 from carlopi/fix_hpp_install
@carlopi carlopi deleted the fix_hpp_install branch July 20, 2024 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Ready For Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@carlopi @Mytherin