1
0
Эх сурвалжийг харах

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.
Gregor Jasny 8 жил өмнө
parent
commit
8643ca75c7

+ 4 - 4
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));
   }