diff options
| author | Brad King <brad.king@kitware.com> | 2005-06-01 17:19:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-06-01 17:19:53 (GMT) |
| commit | 5a4f27b61ce010dd3941ec5fc21a5d87916216e5 (patch) | |
| tree | 33507d6c2a8caf3b7f87de6bba4d68a85e0f7e10 | |
| parent | 8cd3eabee2c3c89543bbb3f3e0f3cdbcde2520be (diff) | |
| download | CMake-5a4f27b61ce010dd3941ec5fc21a5d87916216e5.zip CMake-5a4f27b61ce010dd3941ec5fc21a5d87916216e5.tar.gz CMake-5a4f27b61ce010dd3941ec5fc21a5d87916216e5.tar.bz2 | |
BUG: Fixed name given to clean target listing for executable and library targets.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 7211b24..f6a4816 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1414,7 +1414,7 @@ cmLocalUnixMakefileGenerator3 buildTargetRuleName.c_str()); cleanFiles.push_back(cleanObjs); - cleanFiles.push_back(targetOutPath.c_str()); + cleanFiles.push_back(targetFullPath.c_str()); } //---------------------------------------------------------------------------- @@ -1655,9 +1655,6 @@ cmLocalUnixMakefileGenerator3 // Add a command to remove any existing files for this library. this->AppendCleanCommand(commands, libCleanFiles); - // add the libCleanFiles to to taoal cleanFiles - cleanFiles.insert(cleanFiles.end(),libCleanFiles.begin(),libCleanFiles.end()); - // Add the pre-build and pre-link rules. this->AppendCustomCommands(commands, target.GetPreBuildCommands()); this->AppendCustomCommands(commands, target.GetPreLinkCommands()); @@ -1732,8 +1729,9 @@ cmLocalUnixMakefileGenerator3 this->WriteConvenienceRule(ruleFileStream, targetFullPath.c_str(), buildTargetRuleName.c_str()); + // Clean all the possible library names and symlinks and object files. + cleanFiles.insert(cleanFiles.end(),libCleanFiles.begin(),libCleanFiles.end()); cleanFiles.push_back(cleanObjs); - cleanFiles.push_back(targetOutPath.c_str()); } //---------------------------------------------------------------------------- |