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

Jump to bottom

[vcpkg] remove absolute path #1310

Closed
wants to merge 1 commit into from
Closed

[vcpkg] remove absolute path #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions include/sdf/config.hh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,4 @@

#cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1

#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/"
#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"

#endif // #ifndef SDF_CONFIG_HH_
16 changes: 0 additions & 16 deletions src/SDF.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
}
}

// Next check the install path.
std::string path = sdf::filesystem::append(SDF_SHARE_PATH, filename);
if (sdf::filesystem::exists(path))
{
return path;
}

// Next check the versioned install path.
path = sdf::filesystem::append(SDF_SHARE_PATH,
"sdformat" SDF_MAJOR_VERSION_STR,
sdf::SDF::Version(), filename);
if (sdf::filesystem::exists(path))
{
return path;
}

// Finally check to see if the given file exists.
path = filename;
if (sdf::filesystem::exists(path))
Expand Down
Loading