summaryrefslogtreecommitdiff
path: root/Source/cmCPackPropertiesGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-25 17:55:34 +0200
committerStephen Kelly <steveire@gmail.com>2015-07-27 20:09:38 +0200
commita8e5d838edcb692ff69c2073cf692d7067f52c67 (patch)
treef86d9ecc86ab84e990eefc8efeccbc1d5ae1a949 /Source/cmCPackPropertiesGenerator.cxx
parentd568eefe104e480706a2e6ceb16df4376d4becbf (diff)
downloadcmake-a8e5d838edcb692ff69c2073cf692d7067f52c67.tar.gz
cmCPackPropertiesGenerator: Require cmLocalGenerator in API.
Diffstat (limited to 'Source/cmCPackPropertiesGenerator.cxx')
-rw-r--r--Source/cmCPackPropertiesGenerator.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index 368a0e6de1..cbcdd815e8 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,13 +1,14 @@
#include "cmCPackPropertiesGenerator.h"
#include "cmOutputConverter.h"
+#include "cmLocalGenerator.h"
cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
- cmMakefile* mf,
+ cmLocalGenerator* lg,
cmInstalledFile const& installedFile,
std::vector<std::string> const& configurations):
cmScriptGenerator("CPACK_BUILD_CONFIG", configurations),
- Makefile(mf),
+ LG(lg),
InstalledFile(installedFile)
{
this->ActionsPerConfig = true;
@@ -17,7 +18,8 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
const std::string& config, Indent const& indent)
{
std::string const& expandedFileName =
- this->InstalledFile.GetNameExpression().Evaluate(this->Makefile, config);
+ this->InstalledFile.GetNameExpression().Evaluate(this->LG->GetMakefile(),
+ config);
cmInstalledFile::PropertyMapType const& properties =
this->InstalledFile.GetProperties();
@@ -36,7 +38,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
j = property.ValueExpressions.begin();
j != property.ValueExpressions.end(); ++j)
{
- std::string value = (*j)->Evaluate(this->Makefile, config);
+ std::string value = (*j)->Evaluate(LG->GetMakefile(), config);
os << " " << cmOutputConverter::EscapeForCMake(value);
}