diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 13:42:58 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 14:18:39 -0400 |
commit | 7bbaa4283de26864b2e55e819db0884771585467 (patch) | |
tree | ecb748dbe41a13d8bdea77acd0049cde999d933e /Source/cmFindPathCommand.cxx | |
parent | be9db98946b7918f279812fd0616abb650eebed0 (diff) | |
download | cmake-7bbaa4283de26864b2e55e819db0884771585467.tar.gz |
Remove trailing whitespace from most CMake and C/C++ code
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace. Wipe out all remnants of trailing whitespace
everywhere except third-party code.
Run the following shell code:
git ls-files -z -- \
bootstrap doxygen.config '*.readme' \
'*.c' '*.cmake' '*.cpp' '*.cxx' \
'*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
'*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
Diffstat (limited to 'Source/cmFindPathCommand.cxx')
-rw-r--r-- | Source/cmFindPathCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index 846d187cbf..952492463b 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -104,7 +104,7 @@ bool cmFindPathCommand (this->VariableName.c_str(), (this->VariableName + "-NOTFOUND").c_str(), this->VariableDocumentation.c_str(), - (this->IncludeFileInPath) ? + (this->IncludeFileInPath) ? cmCacheManager::FILEPATH :cmCacheManager::PATH); return true; } @@ -143,14 +143,14 @@ cmFindPathCommand::FindHeaderInFramework(std::string const& file, // remove the name from the slash; fileName = fileName.substr(pos+1); frameWorkName = file; - frameWorkName = + frameWorkName = frameWorkName.substr(0, frameWorkName.size()-fileName.size()-1); // if the framework has a path in it then just use the filename if(frameWorkName.find("/") != frameWorkName.npos) { fileName = file; frameWorkName = ""; - } + } if(frameWorkName.size()) { std::string fpath = dir; @@ -160,7 +160,7 @@ cmFindPathCommand::FindHeaderInFramework(std::string const& file, intPath += "/Headers/"; intPath += fileName; if(cmSystemTools::FileExists(intPath.c_str())) - { + { if(this->IncludeFileInPath) { return intPath; |