diff options
author | Gregor Jasny <gjasny@googlemail.com> | 2017-01-20 22:24:05 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-01-26 18:28:38 (GMT) |
commit | 8643ca75c705568bc9bb084a5182baef04865d2d (patch) | |
tree | 45132bee3d0dd76045c84239fd0cb31da15f83ec /Source/cmMakefileLibraryTargetGenerator.cxx | |
parent | b8db2ed79675930421ac96256d63af515e624d38 (diff) | |
download | CMake-8643ca75c705568bc9bb084a5182baef04865d2d.zip CMake-8643ca75c705568bc9bb084a5182baef04865d2d.tar.gz CMake-8643ca75c705568bc9bb084a5182baef04865d2d.tar.bz2 |
Makefile: Re-order list of files to clean
Revise construction of the list of files to be cleaned for the target to
list the "real" file first.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 27b7c21..33f2c35 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -597,12 +597,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( // Clean files associated with this library. std::vector<std::string> libCleanFiles; libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath( - this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath)); - if (targetNameReal != targetName) { + this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal)); + if (targetName != targetNameReal) { libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath( - this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal)); + this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath)); } - if (targetNameSO != targetName && targetNameSO != targetNameReal) { + if (targetNameSO != targetNameReal && targetNameSO != targetName) { libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath( this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathSO)); } |