cmMakefile: Store EvaluationFiles.
Relieve the cmGlobalGenerator of this responsibility. Evaluate the generator expressions in the context of the cmLocalGenerator.
This commit is contained in:
parent
9432b14e91
commit
6c0e9ee276
|
@ -3573,11 +3573,8 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName,
|
||||||
cmsys::auto_ptr<cmCompiledGeneratorExpression> conditionCge
|
cmsys::auto_ptr<cmCompiledGeneratorExpression> conditionCge
|
||||||
= conditionGe.Parse(condition);
|
= conditionGe.Parse(condition);
|
||||||
|
|
||||||
this->Makefile->GetGlobalGenerator()->AddEvaluationFile(inputName,
|
this->Makefile->AddEvaluationFile(inputName, outputCge,
|
||||||
outputCge,
|
conditionCge, inputIsContent);
|
||||||
this->Makefile,
|
|
||||||
conditionCge,
|
|
||||||
inputIsContent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "cmGeneratedFileStream.h"
|
#include "cmGeneratedFileStream.h"
|
||||||
#include "cmGeneratorTarget.h"
|
#include "cmGeneratorTarget.h"
|
||||||
#include "cmGeneratorExpression.h"
|
#include "cmGeneratorExpression.h"
|
||||||
#include "cmGeneratorExpressionEvaluationFile.h"
|
|
||||||
#include "cmExportBuildFileGenerator.h"
|
#include "cmExportBuildFileGenerator.h"
|
||||||
#include "cmCPackPropertiesGenerator.h"
|
#include "cmCPackPropertiesGenerator.h"
|
||||||
#include "cmAlgorithms.h"
|
#include "cmAlgorithms.h"
|
||||||
|
@ -1561,9 +1560,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
|
||||||
cmDeleteAll(this->GeneratorTargets);
|
cmDeleteAll(this->GeneratorTargets);
|
||||||
this->GeneratorTargets.clear();
|
this->GeneratorTargets.clear();
|
||||||
|
|
||||||
cmDeleteAll(this->EvaluationFiles);
|
|
||||||
this->EvaluationFiles.clear();
|
|
||||||
|
|
||||||
cmDeleteAll(this->BuildExportSets);
|
cmDeleteAll(this->BuildExportSets);
|
||||||
this->BuildExportSets.clear();
|
this->BuildExportSets.clear();
|
||||||
|
|
||||||
|
@ -3032,61 +3028,21 @@ cmGlobalGenerator::GetFilenameTargetDepends(cmSourceFile* sf) const {
|
||||||
void cmGlobalGenerator::CreateEvaluationSourceFiles(
|
void cmGlobalGenerator::CreateEvaluationSourceFiles(
|
||||||
std::string const& config) const
|
std::string const& config) const
|
||||||
{
|
{
|
||||||
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
unsigned int i;
|
||||||
li = this->EvaluationFiles.begin();
|
for (i = 0; i < this->LocalGenerators.size(); ++i)
|
||||||
li != this->EvaluationFiles.end();
|
|
||||||
++li)
|
|
||||||
{
|
{
|
||||||
(*li)->CreateOutputFile(config);
|
this->LocalGenerators[i]->CreateEvaluationFileOutputs(config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
void cmGlobalGenerator::AddEvaluationFile(const std::string &inputFile,
|
|
||||||
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputExpr,
|
|
||||||
cmMakefile *makefile,
|
|
||||||
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
|
|
||||||
bool inputIsContent)
|
|
||||||
{
|
|
||||||
this->EvaluationFiles.push_back(
|
|
||||||
new cmGeneratorExpressionEvaluationFile(inputFile, outputExpr,
|
|
||||||
makefile, condition,
|
|
||||||
inputIsContent));
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmGlobalGenerator::ProcessEvaluationFiles()
|
void cmGlobalGenerator::ProcessEvaluationFiles()
|
||||||
{
|
{
|
||||||
std::vector<std::string> generatedFiles;
|
std::vector<std::string> generatedFiles;
|
||||||
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
unsigned int i;
|
||||||
li = this->EvaluationFiles.begin();
|
for (i = 0; i < this->LocalGenerators.size(); ++i)
|
||||||
li != this->EvaluationFiles.end();
|
|
||||||
++li)
|
|
||||||
{
|
{
|
||||||
(*li)->Generate();
|
this->LocalGenerators[i]->ProcessEvaluationFiles(generatedFiles);
|
||||||
if (cmSystemTools::GetFatalErrorOccured())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
std::vector<std::string> files = (*li)->GetFiles();
|
|
||||||
std::sort(files.begin(), files.end());
|
|
||||||
|
|
||||||
std::vector<std::string> intersection;
|
|
||||||
std::set_intersection(files.begin(), files.end(),
|
|
||||||
generatedFiles.begin(), generatedFiles.end(),
|
|
||||||
std::back_inserter(intersection));
|
|
||||||
if (!intersection.empty())
|
|
||||||
{
|
|
||||||
cmSystemTools::Error("Files to be generated by multiple different "
|
|
||||||
"commands: ", cmWrap('"', intersection, '"', " ").c_str());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
generatedFiles.insert(generatedFiles.end(),
|
|
||||||
files.begin(), files.end());
|
|
||||||
std::vector<std::string>::iterator newIt =
|
|
||||||
generatedFiles.end() - files.size();
|
|
||||||
std::inplace_merge(generatedFiles.begin(), newIt, generatedFiles.end());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
|
|
||||||
class cmake;
|
class cmake;
|
||||||
class cmGeneratorTarget;
|
class cmGeneratorTarget;
|
||||||
class cmGeneratorExpressionEvaluationFile;
|
|
||||||
class cmMakefile;
|
class cmMakefile;
|
||||||
class cmLocalGenerator;
|
class cmLocalGenerator;
|
||||||
class cmExternalMakefileProjectGenerator;
|
class cmExternalMakefileProjectGenerator;
|
||||||
|
@ -334,12 +333,6 @@ public:
|
||||||
|
|
||||||
static std::string EscapeJSON(const std::string& s);
|
static std::string EscapeJSON(const std::string& s);
|
||||||
|
|
||||||
void AddEvaluationFile(const std::string &inputFile,
|
|
||||||
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputName,
|
|
||||||
cmMakefile *makefile,
|
|
||||||
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
|
|
||||||
bool inputIsContent);
|
|
||||||
|
|
||||||
void ProcessEvaluationFiles();
|
void ProcessEvaluationFiles();
|
||||||
|
|
||||||
std::map<std::string, cmExportBuildFileGenerator*>& GetBuildExportSets()
|
std::map<std::string, cmExportBuildFileGenerator*>& GetBuildExportSets()
|
||||||
|
@ -436,7 +429,6 @@ protected:
|
||||||
TargetMap TotalTargets;
|
TargetMap TotalTargets;
|
||||||
TargetMap AliasTargets;
|
TargetMap AliasTargets;
|
||||||
TargetMap ImportedTargets;
|
TargetMap ImportedTargets;
|
||||||
std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
|
|
||||||
|
|
||||||
const char* GetPredefinedTargetsFolder();
|
const char* GetPredefinedTargetsFolder();
|
||||||
virtual bool UseFolderProperty();
|
virtual bool UseFolderProperty();
|
||||||
|
|
|
@ -1055,23 +1055,21 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
|
||||||
{
|
{
|
||||||
knownDependencies.insert( ng->ConvertToNinjaPath( *j ) );
|
knownDependencies.insert( ng->ConvertToNinjaPath( *j ) );
|
||||||
}
|
}
|
||||||
}
|
std::vector<cmGeneratorExpressionEvaluationFile*> const& ef =
|
||||||
knownDependencies.insert( "CMakeCache.txt" );
|
(*i)->GetMakefile()->GetEvaluationFiles();
|
||||||
|
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
||||||
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
li = ef.begin(); li != ef.end(); ++li)
|
||||||
li = this->EvaluationFiles.begin();
|
|
||||||
li != this->EvaluationFiles.end();
|
|
||||||
++li)
|
|
||||||
{
|
|
||||||
//get all the files created by generator expressions and convert them
|
|
||||||
//to ninja paths
|
|
||||||
std::vector<std::string> files = (*li)->GetFiles();
|
|
||||||
typedef std::vector<std::string>::const_iterator vect_it;
|
|
||||||
for(vect_it j = files.begin(); j != files.end(); ++j)
|
|
||||||
{
|
{
|
||||||
knownDependencies.insert( ng->ConvertToNinjaPath( *j ) );
|
//get all the files created by generator expressions and convert them
|
||||||
|
//to ninja paths
|
||||||
|
std::vector<std::string> evaluationFiles = (*li)->GetFiles();
|
||||||
|
for(vect_it j = evaluationFiles.begin(); j != evaluationFiles.end(); ++j)
|
||||||
|
{
|
||||||
|
knownDependencies.insert( ng->ConvertToNinjaPath( *j ) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
knownDependencies.insert( "CMakeCache.txt" );
|
||||||
|
|
||||||
for(TargetAliasMap::const_iterator i= this->TargetAliases.begin();
|
for(TargetAliasMap::const_iterator i= this->TargetAliases.begin();
|
||||||
i != this->TargetAliases.end();
|
i != this->TargetAliases.end();
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include "cmGlobalGenerator.h"
|
#include "cmGlobalGenerator.h"
|
||||||
#include "cmInstallGenerator.h"
|
#include "cmInstallGenerator.h"
|
||||||
#include "cmInstallFilesGenerator.h"
|
#include "cmInstallFilesGenerator.h"
|
||||||
|
#include "cmGeneratorExpressionEvaluationFile.h"
|
||||||
#include "cmInstallScriptGenerator.h"
|
#include "cmInstallScriptGenerator.h"
|
||||||
#include "cmInstallTargetGenerator.h"
|
#include "cmInstallTargetGenerator.h"
|
||||||
#include "cmMakefile.h"
|
#include "cmMakefile.h"
|
||||||
|
@ -212,6 +213,53 @@ void cmLocalGenerator::GenerateTestFiles()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cmLocalGenerator::CreateEvaluationFileOutputs(std::string const& config)
|
||||||
|
{
|
||||||
|
std::vector<cmGeneratorExpressionEvaluationFile*> ef =
|
||||||
|
this->Makefile->GetEvaluationFiles();
|
||||||
|
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
||||||
|
li = ef.begin(); li != ef.end(); ++li)
|
||||||
|
{
|
||||||
|
(*li)->CreateOutputFile(config);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void cmLocalGenerator::ProcessEvaluationFiles(
|
||||||
|
std::vector<std::string>& generatedFiles)
|
||||||
|
{
|
||||||
|
std::vector<cmGeneratorExpressionEvaluationFile*> ef =
|
||||||
|
this->Makefile->GetEvaluationFiles();
|
||||||
|
for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
|
||||||
|
li = ef.begin();
|
||||||
|
li != ef.end();
|
||||||
|
++li)
|
||||||
|
{
|
||||||
|
(*li)->Generate();
|
||||||
|
if (cmSystemTools::GetFatalErrorOccured())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
std::vector<std::string> files = (*li)->GetFiles();
|
||||||
|
std::sort(files.begin(), files.end());
|
||||||
|
|
||||||
|
std::vector<std::string> intersection;
|
||||||
|
std::set_intersection(files.begin(), files.end(),
|
||||||
|
generatedFiles.begin(), generatedFiles.end(),
|
||||||
|
std::back_inserter(intersection));
|
||||||
|
if (!intersection.empty())
|
||||||
|
{
|
||||||
|
cmSystemTools::Error("Files to be generated by multiple different "
|
||||||
|
"commands: ", cmWrap('"', intersection, '"', " ").c_str());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
generatedFiles.insert(generatedFiles.end(), files.begin(), files.end());
|
||||||
|
std::vector<std::string>::iterator newIt =
|
||||||
|
generatedFiles.end() - files.size();
|
||||||
|
std::inplace_merge(generatedFiles.begin(), newIt, generatedFiles.end());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmLocalGenerator::GenerateInstallRules()
|
void cmLocalGenerator::GenerateInstallRules()
|
||||||
{
|
{
|
||||||
|
|
|
@ -305,6 +305,8 @@ public:
|
||||||
|
|
||||||
void IssueMessage(cmake::MessageType t, std::string const& text) const;
|
void IssueMessage(cmake::MessageType t, std::string const& text) const;
|
||||||
|
|
||||||
|
void CreateEvaluationFileOutputs(const std::string& config);
|
||||||
|
void ProcessEvaluationFiles(std::vector<std::string>& generatedFiles);
|
||||||
|
|
||||||
void ComputeObjectMaxPath();
|
void ComputeObjectMaxPath();
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "cmState.h"
|
#include "cmState.h"
|
||||||
#include "cmOutputConverter.h"
|
#include "cmOutputConverter.h"
|
||||||
#include "cmFunctionBlocker.h"
|
#include "cmFunctionBlocker.h"
|
||||||
|
#include "cmGeneratorExpressionEvaluationFile.h"
|
||||||
#include "cmListFileCache.h"
|
#include "cmListFileCache.h"
|
||||||
#include "cmCommandArgumentParserHelper.h"
|
#include "cmCommandArgumentParserHelper.h"
|
||||||
#include "cmGeneratorExpression.h"
|
#include "cmGeneratorExpression.h"
|
||||||
|
@ -235,6 +236,9 @@ cmMakefile::~cmMakefile()
|
||||||
cmDeleteAll(this->ImportedTargetsOwned);
|
cmDeleteAll(this->ImportedTargetsOwned);
|
||||||
cmDeleteAll(this->FinalPassCommands);
|
cmDeleteAll(this->FinalPassCommands);
|
||||||
cmDeleteAll(this->FunctionBlockers);
|
cmDeleteAll(this->FunctionBlockers);
|
||||||
|
cmDeleteAll(this->EvaluationFiles);
|
||||||
|
this->EvaluationFiles.clear();
|
||||||
|
|
||||||
this->FunctionBlockers.clear();
|
this->FunctionBlockers.clear();
|
||||||
if (this->PolicyStack.size() != 1)
|
if (this->PolicyStack.size() != 1)
|
||||||
{
|
{
|
||||||
|
@ -777,6 +781,23 @@ void cmMakefile::EnforceDirectoryLevelRules() const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cmMakefile::AddEvaluationFile(const std::string& inputFile,
|
||||||
|
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputName,
|
||||||
|
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
|
||||||
|
bool inputIsContent)
|
||||||
|
{
|
||||||
|
this->EvaluationFiles.push_back(
|
||||||
|
new cmGeneratorExpressionEvaluationFile(inputFile, outputName,
|
||||||
|
this, condition,
|
||||||
|
inputIsContent));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<cmGeneratorExpressionEvaluationFile*>
|
||||||
|
cmMakefile::GetEvaluationFiles() const
|
||||||
|
{
|
||||||
|
return this->EvaluationFiles;
|
||||||
|
}
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
struct file_not_persistent
|
struct file_not_persistent
|
||||||
|
|
|
@ -52,6 +52,7 @@ class cmVariableWatch;
|
||||||
class cmake;
|
class cmake;
|
||||||
class cmMakefileCall;
|
class cmMakefileCall;
|
||||||
class cmCMakePolicyCommand;
|
class cmCMakePolicyCommand;
|
||||||
|
class cmGeneratorExpressionEvaluationFile;
|
||||||
|
|
||||||
/** \class cmMakefile
|
/** \class cmMakefile
|
||||||
* \brief Process the input CMakeLists.txt file.
|
* \brief Process the input CMakeLists.txt file.
|
||||||
|
@ -799,6 +800,12 @@ public:
|
||||||
|
|
||||||
void EnforceDirectoryLevelRules() const;
|
void EnforceDirectoryLevelRules() const;
|
||||||
|
|
||||||
|
void AddEvaluationFile(const std::string &inputFile,
|
||||||
|
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputName,
|
||||||
|
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
|
||||||
|
bool inputIsContent);
|
||||||
|
std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// add link libraries and directories to the target
|
// add link libraries and directories to the target
|
||||||
void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
|
void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
|
||||||
|
@ -895,6 +902,8 @@ private:
|
||||||
|
|
||||||
std::vector<cmMakefile*> UnConfiguredDirectories;
|
std::vector<cmMakefile*> UnConfiguredDirectories;
|
||||||
|
|
||||||
|
std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
|
||||||
|
|
||||||
cmPropertyMap Properties;
|
cmPropertyMap Properties;
|
||||||
|
|
||||||
std::vector<cmCommandContext const*> ContextStack;
|
std::vector<cmCommandContext const*> ContextStack;
|
||||||
|
|
Loading…
Reference in New Issue