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.

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

Catch2 contents removed from external\catch2 path #3962

Closed

Conversation

agarwalishita
Copy link

Description

Catch2 was getting synced at 2 paths:
external\catch2
external\usersim\external\catch2

So, the former submodule has been deleted as part of this PR
and the source path used is : external\usersim\external\catch2 for creating build files

@agarwalishita
Copy link
Author

agarwalishita commented Oct 29, 2024 via email

@dthaler
Copy link
Collaborator

dthaler commented Oct 29, 2024

You just need to remove catch2 from the .gitmodules file in the root of this repository, and change any include paths based on any compilation errors that occur to point to the other path

Comment on lines +21 to +22
# Update all submodules except the Catch2 within usersim
"git submodule update --init --recursive -- ':(exclude)external/usersim/external/Catch2'",
Copy link
Collaborator

@dthaler dthaler Oct 29, 2024

Choose a reason for hiding this comment

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

Shouldn't need this change

@agarwalishita
Copy link
Author

You just need to remove catch2 from the .gitmodules file in the root of this repository, and change any include paths based on any compilation errors that occur to point to the other path

In that case, if usersim stops depending on catch2, won't this repo start breaking?

@dthaler
Copy link
Collaborator

dthaler commented Oct 29, 2024

You just need to remove catch2 from the .gitmodules file in the root of this repository, and change any include paths based on any compilation errors that occur to point to the other path

In that case, if usersim stops depending on catch2, won't this repo start breaking?

Usersim should not stop depending on catch2, it should not be removed from usersim.
ebpf-for-windows should use the one exposed by usersim so this repo won't break.

@agarwalishita
Copy link
Author

You just need to remove catch2 from the .gitmodules file in the root of this repository, and change any include paths based on any compilation errors that occur to point to the other path

In that case, if usersim stops depending on catch2, won't this repo start breaking?

Usersim should not stop depending on catch2, it should not be removed from usersim. ebpf-for-windows should use the one exposed by usersim so this repo won't break.

Sure, thanks for confirming, will make the changes accordingly

@agarwalishita
Copy link
Author

Created a new PR #3973, hence closing this PR

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.

2 participants