kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix FILES mode after recent changes.

This commit is contained in:
Brad King 2007-05-25 11:08:52 -04:00
parent 92ec498b8c
commit 22a1df0576
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmInstallFilesCommand.cxx
View File

@ -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
Source/cmInstallFilesCommand.h
View File

@ -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: