Selaa lähdekoodia

cmMakefile: Extract conditional code to caller.

Stephen Kelly 10 vuotta sitten
vanhempi
sitoutus
95a27267da
1 muutettua tiedostoa jossa 1 lisäystä ja 5 poistoa
  1. 1 5
      Source/cmMakefile.cxx

+ 1 - 5
Source/cmMakefile.cxx

@@ -525,6 +525,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
 bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
 bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
 {
 {
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
+  this->cmCurrentListFile = listfile;
   return this->ReadListFile(listfile, 0, true,
   return this->ReadListFile(listfile, 0, true,
                             this->cmStartDirectory == this->cmHomeDirectory);
                             this->cmStartDirectory == this->cmHomeDirectory);
 }
 }
@@ -553,11 +554,6 @@ bool cmMakefile::ReadListFile(const char* filename_in,
     filenametoread = filename_in;
     filenametoread = filename_in;
     }
     }
 
 
-  if (!filenametoread.empty())
-    {
-    this->cmCurrentListFile = filenametoread;
-    }
-
   if (external_in)
   if (external_in)
     {
     {
     filenametoread =
     filenametoread =