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.

Sign up for GitHub

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

Fix Windows build: filesystem #2839

Merged
merged 2 commits into from
Sep 5, 2020
Merged

Fix Windows build: filesystem #2839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d164f1
Fix Windows build: filesystem
chapulina Sep 3, 2020
30bf111
just use boost
chapulina Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions gazebo/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,6 @@ if (UNIX AND NOT APPLE)
target_link_libraries(gazebo_common PRIVATE rt)
chapulina marked this conversation as resolved.
Show resolved Hide resolved
endif()

if (NOT APPLE)
target_link_libraries(gazebo_common PRIVATE stdc++fs)
endif()

if (HAVE_GTS)
target_link_libraries(gazebo_common PRIVATE ${gts_LIBRARIES})
endif()
Expand Down
5 changes: 1 addition & 4 deletions gazebo/common/CommonIface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
#include <sys/sendfile.h>
#endif

#ifndef __APPLE__
#include <filesystem>
#endif
#include <ignition/common/Filesystem.hh>

#include <boost/filesystem/operations.hpp>
Expand Down Expand Up @@ -465,7 +462,7 @@ std::string common::asFullPath(const std::string &_uri,
#else
// Not a relative path, return unmodified
if (_uri.find("://") != std::string::npos ||
!std::filesystem::path(_uri).is_relative())
!boost::filesystem::path(_uri).is_relative())
{
return _uri;
}
Expand Down