kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: clean rule wasn't cleaning libs and executables

This commit is contained in:
Ken Martin 2005-06-22 10:09:17 -04:00
parent 3b66c0a574
commit cba6b73340
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1460,7 +1460,8 @@ cmLocalUnixMakefileGenerator3
buildTargetRuleName.c_str()); buildTargetRuleName.c_str());
cleanFiles.push_back(cleanObjs); cleanFiles.push_back(cleanObjs);
cleanFiles.push_back(targetFullPath.c_str()); cleanFiles.push_back
(this->Convert(targetFullPath.c_str(),HOME_OUTPUT,MAKEFILE));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -1689,24 +1690,28 @@ cmLocalUnixMakefileGenerator3
std::string cleanFullSharedName = outpath + cleanSharedName; std::string cleanFullSharedName = outpath + cleanSharedName;
std::string cleanFullSharedSOName = outpath + cleanSharedSOName; std::string cleanFullSharedSOName = outpath + cleanSharedSOName;
std::string cleanFullSharedRealName = outpath + cleanSharedRealName; std::string cleanFullSharedRealName = outpath + cleanSharedRealName;
libCleanFiles.push_back(cleanFullStaticName); libCleanFiles.push_back
(this->Convert(cleanFullStaticName.c_str(),HOME_OUTPUT,MAKEFILE));
if(cleanSharedRealName != cleanStaticName) if(cleanSharedRealName != cleanStaticName)
{ {
libCleanFiles.push_back(cleanFullSharedRealName); libCleanFiles.push_back
(this->Convert(cleanFullSharedRealName.c_str(),HOME_OUTPUT,MAKEFILE));
} }
if(cleanSharedSOName != cleanStaticName && if(cleanSharedSOName != cleanStaticName &&
cleanSharedSOName != cleanSharedRealName) cleanSharedSOName != cleanSharedRealName)
{ {
libCleanFiles.push_back(cleanFullSharedSOName); libCleanFiles.push_back
(this->Convert(cleanFullSharedSOName.c_str(),HOME_OUTPUT,MAKEFILE));
} }
if(cleanSharedName != cleanStaticName && if(cleanSharedName != cleanStaticName &&
cleanSharedName != cleanSharedSOName && cleanSharedName != cleanSharedSOName &&
cleanSharedName != cleanSharedRealName) cleanSharedName != cleanSharedRealName)
{ {
libCleanFiles.push_back(cleanFullSharedName); libCleanFiles.push_back
(this->Convert(cleanFullSharedName.c_str(),HOME_OUTPUT,MAKEFILE));
} }
} }
// Add a command to remove any existing files for this library. // Add a command to remove any existing files for this library.
this->AppendCleanCommand(commands, libCleanFiles); this->AppendCleanCommand(commands, libCleanFiles);