diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-01 09:01:03 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-23 17:21:27 +0200 |
| commit | 75e511eeaf77848ffef00d570cb10243764f51d2 (patch) | |
| tree | c212bd42181b246123e8ffd7ef57eccf77ef00ed /Source/cmInstallFilesGenerator.cxx | |
| parent | 29c1385675df37146465e820d303de3cdd703e8c (diff) | |
| download | cmake-75e511eeaf77848ffef00d570cb10243764f51d2.tar.gz | |
cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
Diffstat (limited to 'Source/cmInstallFilesGenerator.cxx')
| -rw-r--r-- | Source/cmInstallFilesGenerator.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index ff2c6e5b2e..c18b174b4a 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -14,11 +14,11 @@ #include "cmGeneratorExpression.h" #include "cmMakefile.h" #include "cmSystemTools.h" +#include "cmLocalGenerator.h" //---------------------------------------------------------------------------- cmInstallFilesGenerator -::cmInstallFilesGenerator(cmMakefile* mf, - std::vector<std::string> const& files, +::cmInstallFilesGenerator(std::vector<std::string> const& files, const char* dest, bool programs, const char* file_permissions, std::vector<std::string> const& configurations, @@ -27,7 +27,7 @@ cmInstallFilesGenerator const char* rename, bool optional): cmInstallGenerator(dest, configurations, component, message), - Makefile(mf), + LocalGenerator(0), Files(files), FilePermissions(file_permissions), Rename(rename), @@ -51,6 +51,11 @@ cmInstallFilesGenerator { } +void cmInstallFilesGenerator::Compute(cmLocalGenerator* lg) +{ + this->LocalGenerator = lg; +} + //---------------------------------------------------------------------------- void cmInstallFilesGenerator::AddFilesInstallRule( std::ostream& os, Indent const& indent, @@ -94,8 +99,8 @@ void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os, i != this->Files.end(); ++i) { cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i); - cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config), - files); + cmSystemTools::ExpandListArgument(cge->Evaluate( + this->LocalGenerator->GetMakefile(), config), files); } this->AddFilesInstallRule(os, indent, files); } |