Ver Fonte

BUG: Fix FILES mode after recent changes.

Brad King há 18 anos atrás
pai
commit
22a1df0576
2 ficheiros alterados com 8 adições e 0 exclusões
  1. 7 0
      Source/cmInstallFilesCommand.cxx
  2. 1 0
      Source/cmInstallFilesCommand.h

+ 7 - 0
Source/cmInstallFilesCommand.cxx

@@ -47,6 +47,7 @@ bool cmInstallFilesCommand
       std::string f = this->FindInstallSource(s->c_str());
       std::string f = this->FindInstallSource(s->c_str());
       this->Files.push_back(f);
       this->Files.push_back(f);
       }
       }
+    this->CreateInstallGenerator();
     }
     }
   else
   else
     {
     {
@@ -112,6 +113,11 @@ void cmInstallFilesCommand::FinalPass()
       }
       }
     }
     }
 
 
+  this->CreateInstallGenerator();
+}
+
+void cmInstallFilesCommand::CreateInstallGenerator() const
+{
   // Construct the destination.  This command always installs under
   // Construct the destination.  This command always installs under
   // the prefix.
   // the prefix.
   std::string destination = "${CMAKE_INSTALL_PREFIX}";
   std::string destination = "${CMAKE_INSTALL_PREFIX}";
@@ -130,6 +136,7 @@ void cmInstallFilesCommand::FinalPass()
                                 no_component, no_rename));
                                 no_component, no_rename));
 }
 }
 
 
+
 /**
 /**
  * Find a file in the build or source tree for installation given a
  * Find a file in the build or source tree for installation given a
  * relative path from the CMakeLists.txt file.  This will favor files
  * relative path from the CMakeLists.txt file.  This will favor files

+ 1 - 0
Source/cmInstallFilesCommand.h

@@ -103,6 +103,7 @@ public:
   cmTypeMacro(cmInstallFilesCommand, cmCommand);
   cmTypeMacro(cmInstallFilesCommand, cmCommand);
 
 
 protected:
 protected:
+  void CreateInstallGenerator() const;
   std::string FindInstallSource(const char* name) const;
   std::string FindInstallSource(const char* name) const;
   
   
  private:
  private: