summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-08-14 13:53:26 (GMT)
committerBrad King <brad.king@kitware.com>2008-08-14 13:53:26 (GMT)
commit8063dd293e6f9c25dcfa964989138d4f5bb135ac (patch)
treeed2cceb2c50738e2332ace43306b33948380f4f8 /Source/cmSystemTools.cxx
parent485c3faea7cdae0086b1ea3d9eda4b49e595a584 (diff)
downloadCMake-8063dd293e6f9c25dcfa964989138d4f5bb135ac.zip
CMake-8063dd293e6f9c25dcfa964989138d4f5bb135ac.tar.gz
CMake-8063dd293e6f9c25dcfa964989138d4f5bb135ac.tar.bz2
ENH: Inform user when RPATH or RUNPATH is removed
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ba85034..f333a4c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2525,9 +2525,14 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
}
//----------------------------------------------------------------------------
-bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg)
+bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
+ bool* removed)
{
#if defined(CMAKE_USE_ELF_PARSER)
+ if(removed)
+ {
+ *removed = false;
+ }
int zeroCount = 0;
unsigned long zeroPosition[2] = {0,0};
unsigned long zeroSize[2] = {0,0};
@@ -2676,10 +2681,15 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg)
}
// Everything was updated successfully.
+ if(removed)
+ {
+ *removed = true;
+ }
return true;
#else
(void)file;
(void)emsg;
+ (void)removed;
return false;
#endif
}