Skip to content

Fix include path so that <bolero/mars_environment/MARSEnvironment.h> …#123

Open
2maz wants to merge 3 commits into
distributionfrom
fix_include_path
Open

Fix include path so that <bolero/mars_environment/MARSEnvironment.h> …#123
2maz wants to merge 3 commits into
distributionfrom
fix_include_path

Conversation

@2maz

@2maz 2maz commented Sep 15, 2021

Copy link
Copy Markdown
Contributor

…include works

Testing with an autoproj separate prefix installation

…include works

Testing with an autoproj separate prefix installation
@2maz 2maz requested a review from malter September 15, 2021 09:55
@AlexanderFabisch

Copy link
Copy Markdown
Contributor

could you rebase on #122?

m0rsch1 and others added 2 commits September 17, 2021 10:04
Signed-off-by: Moritz Schilling <moritz.schilling@dfki.de>
Otherwise #include <bolero/Behavior.h> will only accidentially work
@AlexanderFabisch

Copy link
Copy Markdown
Contributor

@maotto @malter OK, this Pull Request tries to merge into the branch distribution (as pointed out in #124 ), why is it the case? Is the branch used in any build configuration?

@malter

malter commented Dec 15, 2021

Copy link
Copy Markdown
Member

It is used in the Q-Rock stack. I will check what is going on.

@AlexanderFabisch

AlexanderFabisch commented Dec 15, 2021

Copy link
Copy Markdown
Contributor

I'll set master as the new target branch for this.

edit: sorry, not a good idea, what I actually want to do is cherry-pick the last commit on push it to master so that you can rebase distribution on master

@AlexanderFabisch AlexanderFabisch changed the base branch from distribution to master December 15, 2021 13:46
@AlexanderFabisch AlexanderFabisch changed the base branch from master to distribution December 15, 2021 13:46
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.

4 participants