Skip to content

cmake: fix Xcode project generation to include all header files. #35647

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

Merged
merged 1 commit into from
Jan 29, 2021

Conversation

eeckstein
Copy link
Contributor

This was broken by commit cf1f240.
This commit reverts the 2 lines which broke the inclusion of header files in the generated Xcode project.

This was broken by commit cf1f240.
This commit reverts the 2 lines which broke the inclusion of header files in the generated Xcode project.
@eeckstein
Copy link
Contributor Author

@swift-ci smoke test and merge

@eeckstein eeckstein requested a review from compnerd January 29, 2021 15:35
get_filename_component(dir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)

string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
list(GET split_path -1 dir)
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I'm not sure I understand how this differs. Is this not getting the basename of the current source dir?

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, but the wrong code did get the directory.
Sorry, I didn't spent too much time on it - I just reverted.

@swift-ci swift-ci merged commit 9faf023 into swiftlang:main Jan 29, 2021
@eeckstein eeckstein deleted the fix-cmake branch January 29, 2021 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants