|
@@ -468,9 +468,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
|
|
|
return i->second;
|
|
return i->second;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-void cmGeneratorTarget::AddSource(const std::string& src)
|
|
|
|
|
|
|
+void cmGeneratorTarget::AddSourceCommon(const std::string& src)
|
|
|
{
|
|
{
|
|
|
- this->Target->AddSource(src);
|
|
|
|
|
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
|
|
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
|
|
|
cmGeneratorExpression ge(lfbt);
|
|
cmGeneratorExpression ge(lfbt);
|
|
|
CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(src);
|
|
CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(src);
|
|
@@ -480,19 +479,17 @@ void cmGeneratorTarget::AddSource(const std::string& src)
|
|
|
this->LinkImplementationLanguageIsContextDependent = true;
|
|
this->LinkImplementationLanguageIsContextDependent = true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+void cmGeneratorTarget::AddSource(const std::string& src)
|
|
|
|
|
+{
|
|
|
|
|
+ this->Target->AddSource(src);
|
|
|
|
|
+ this->AddSourceCommon(src);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
|
|
void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
|
|
|
{
|
|
{
|
|
|
this->Target->AddTracedSources(srcs);
|
|
this->Target->AddTracedSources(srcs);
|
|
|
if (!srcs.empty()) {
|
|
if (!srcs.empty()) {
|
|
|
- std::string srcFiles = cmJoin(srcs, ";");
|
|
|
|
|
- this->SourceFilesMap.clear();
|
|
|
|
|
- this->LinkImplementationLanguageIsContextDependent = true;
|
|
|
|
|
- cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
|
|
|
|
|
- cmGeneratorExpression ge(lfbt);
|
|
|
|
|
- CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
|
|
|
|
|
- cge->SetEvaluateForBuildsystem(true);
|
|
|
|
|
- this->SourceEntries.push_back(
|
|
|
|
|
- new cmGeneratorTarget::TargetPropertyEntry(cge));
|
|
|
|
|
|
|
+ this->AddSourceCommon(cmJoin(srcs, ";"));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|