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

[SofaKernel] Cherry-pick PR#122 : Fix FileRepository should not be optional #188

Merged
merged 2 commits into from
Mar 2, 2017

Conversation

hugtalbot
Copy link
Contributor

@hugtalbot hugtalbot commented Feb 24, 2017

Cherry-pick from master to v16.12.
Fix compilation (#122) due to boost : FileRepository was not compiled if Boost_FILESYSTEM was not found.
Commits 586820f and 6454b77 fixing it.


This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings nor unit test failures.
  • does not break existing scenes.
  • does not break API compatibility.
  • has been reviewed and agreed to be transitional.

Reviewers will merge only if all these checks are true.

@hugtalbot hugtalbot added the pr: fast merge Minor change that can be merged without waiting for the 7 review days label Feb 24, 2017
@guparan
Copy link
Contributor

guparan commented Feb 27, 2017

CI cannot build this PR because of hardcoded compiler stuff.
Builds with success on Windows7 + VS2013

Thomas Lemaire added 2 commits February 27, 2017 17:29
@guparan guparan removed their request for review February 27, 2017 16:33
@guparan guparan merged commit d926349 into sofa-framework:v16.12 Mar 2, 2017
@guparan guparan added the pr: fix Fix a bug label Jun 29, 2017
@guparan guparan modified the milestones: v17.06, v16.12 Jun 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants