pineapple-src/externals/vcpkg/ports/sdformat9/no-absolute.patch
2022-07-23 03:01:36 +02:00

38 lines
1.2 KiB
Diff
Executable file

diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in
index c3ce2336..64ac9f5f 100644
--- a/cmake/sdf_config.h.in
+++ b/cmake/sdf_config.h.in
@@ -31,6 +31,3 @@
#cmakedefine BUILD_TYPE_RELEASE 1
#cmakedefine HAVE_URDFDOM 1
#cmakedefine USE_INTERNAL_URDF 1
-
-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/"
-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"
diff --git a/src/SDF.cc b/src/SDF.cc
index 48c1943b..bd2c5b31 100644
--- a/src/SDF.cc
+++ b/src/SDF.cc
@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
filename = filename.substr(idx + sep.length());
}
- // Next check the install path.
- 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;
- }
-
// Next check to see if the given file exists.
path = filename;
if (sdf::filesystem::exists(path))