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

vs2015 doesnt support __has_include, VS2015 and 2017 have both <files… #96

Merged
merged 3 commits into from
Jan 8, 2018

Conversation

mikaelarguedas
Copy link
Member

…ystem> and <experimental/filesystem> but use std::experimental::filesystem in both cases

This is a redo of #92 kindly contributed by @bfjelds, I had to open another PR as the folder structure changed and resolving conflicts will be inconvenient.

The rationale for the change and the compiler versions it applies to are documented here.

@wjwwood As the original author of the filesystem detection logic, would you mind giving this a 👀 before I merge it ?

@mikaelarguedas
Copy link
Member Author

  • Linux Build Status
  • Linux-aarch64 Build Status (unrelated)
  • macOS Build Status
  • Windows Build Status

@wjwwood wjwwood mentioned this pull request Jan 8, 2018
bfjelds and others added 3 commits January 8, 2018 07:47
Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

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

lgtm, CI (since I messed with the commits):

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@mikaelarguedas
Copy link
Member Author

Thanks @wjwwood for the review and restoring the commits. Don't know why I couldnt get the original commit in easily. I agree that's a better history crediting the original author. Thanks again @bfjelds for the fix.

MSVC warnings and test failures unrelated to this change, merging

@mikaelarguedas mikaelarguedas merged commit 7a304d5 into ros2 Jan 8, 2018
@mikaelarguedas mikaelarguedas deleted the ros_ros2_mikael branch January 8, 2018 19:33
wjwwood added a commit that referenced this pull request Feb 8, 2018
* remove references to plugin_tool from CMakeLists (#93)

* move pluginlib in its own folder (port 83 to ros2 branch) (#95)

* move pluginlib in its own folder (port 83 to ros2 branch)

* fix most linter errors

* forward port of #88

Continue loading classes on error

* vs2015 doesnt support __has_include, VS2015 and 2017 have both <files… (#96)

* windows contains older version of std filesystem

* either <experimental/filesystem> or <filesystem> will work ... use experimental to be namespace-consistent

* vs2015 doesnt support __has_include, VS2015 and 2017 have both <filesystem> and <experimental/filesystem> but use std::experimental::filesystem in both cases

* adjust library search to work on windows, warn about lib prefix (#97)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants