|
|
@@ -2326,12 +2326,12 @@ struct cmSystemToolsRPathInfo
|
|
|
};
|
|
|
#endif
|
|
|
|
|
|
+#if defined(CMAKE_USE_ELF_PARSER)
|
|
|
bool cmSystemTools::ChangeRPath(std::string const& file,
|
|
|
std::string const& oldRPath,
|
|
|
std::string const& newRPath, std::string* emsg,
|
|
|
bool* changed)
|
|
|
{
|
|
|
-#if defined(CMAKE_USE_ELF_PARSER)
|
|
|
if (changed) {
|
|
|
*changed = false;
|
|
|
}
|
|
|
@@ -2497,15 +2497,16 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
|
|
|
*changed = true;
|
|
|
}
|
|
|
return true;
|
|
|
+}
|
|
|
#else
|
|
|
- (void)file;
|
|
|
- (void)oldRPath;
|
|
|
- (void)newRPath;
|
|
|
- (void)emsg;
|
|
|
- (void)changed;
|
|
|
+bool cmSystemTools::ChangeRPath(std::string const& /*file*/,
|
|
|
+ std::string const& /*oldRPath*/,
|
|
|
+ std::string const& /*newRPath*/,
|
|
|
+ std::string* /*emsg*/, bool* /*changed*/)
|
|
|
+{
|
|
|
return false;
|
|
|
-#endif
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
|
|
|
const char* lhss, const char* rhss)
|
|
|
@@ -2639,10 +2640,10 @@ int cmSystemTools::strverscmp(std::string const& lhs, std::string const& rhs)
|
|
|
return cm_strverscmp(lhs.c_str(), rhs.c_str());
|
|
|
}
|
|
|
|
|
|
+#if defined(CMAKE_USE_ELF_PARSER)
|
|
|
bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
|
|
|
bool* removed)
|
|
|
{
|
|
|
-#if defined(CMAKE_USE_ELF_PARSER)
|
|
|
if (removed) {
|
|
|
*removed = false;
|
|
|
}
|
|
|
@@ -2780,13 +2781,14 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
|
|
|
*removed = true;
|
|
|
}
|
|
|
return true;
|
|
|
+}
|
|
|
#else
|
|
|
- (void)file;
|
|
|
- (void)emsg;
|
|
|
- (void)removed;
|
|
|
+bool cmSystemTools::RemoveRPath(std::string const& /*file*/,
|
|
|
+ std::string* /*emsg*/, bool* /*removed*/)
|
|
|
+{
|
|
|
return false;
|
|
|
-#endif
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
bool cmSystemTools::CheckRPath(std::string const& file,
|
|
|
std::string const& newRPath)
|