mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-22 14:23:10 -05:00
Restore support for explicitly referenced CMakeLists.txt sources
Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to target sources but instead generate references to them directly. This broke projects that explicitly specify their `CMakeLists.txt` file as a source file because the explicit entry is no longer consolidated with the generated one. Teach the relevant generators to avoid duplicating `CMakeLists.txt` source references and add test cases. Fixes: #17828
This commit is contained in:
@@ -821,6 +821,19 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
|
||||
return buildFile;
|
||||
}
|
||||
|
||||
void cmGlobalXCodeGenerator::AddXCodeProjBuildRule(
|
||||
cmGeneratorTarget* target, std::vector<cmSourceFile*>& sources) const
|
||||
{
|
||||
std::string listfile =
|
||||
target->GetLocalGenerator()->GetCurrentSourceDirectory();
|
||||
listfile += "/CMakeLists.txt";
|
||||
cmSourceFile* srcCMakeLists = target->Makefile->GetOrCreateSource(listfile);
|
||||
if (std::find(sources.begin(), sources.end(), srcCMakeLists) ==
|
||||
sources.end()) {
|
||||
sources.push_back(srcCMakeLists);
|
||||
}
|
||||
}
|
||||
|
||||
std::string GetSourcecodeValueFromFileExtension(const std::string& _ext,
|
||||
const std::string& lang,
|
||||
bool& keepLastKnownFileType)
|
||||
@@ -1043,10 +1056,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets(
|
||||
}
|
||||
|
||||
// Add CMakeLists.txt file for user convenience.
|
||||
std::string listfile =
|
||||
gtgt->GetLocalGenerator()->GetCurrentSourceDirectory();
|
||||
listfile += "/CMakeLists.txt";
|
||||
classes.push_back(gtgt->Makefile->GetOrCreateSource(listfile));
|
||||
this->AddXCodeProjBuildRule(gtgt, classes);
|
||||
|
||||
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
|
||||
|
||||
@@ -2343,10 +2353,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateUtilityTarget(
|
||||
}
|
||||
|
||||
// Add CMakeLists.txt file for user convenience.
|
||||
std::string listfile =
|
||||
gtgt->GetLocalGenerator()->GetCurrentSourceDirectory();
|
||||
listfile += "/CMakeLists.txt";
|
||||
sources.push_back(gtgt->Makefile->GetOrCreateSource(listfile));
|
||||
this->AddXCodeProjBuildRule(gtgt, sources);
|
||||
|
||||
for (auto sourceFile : sources) {
|
||||
if (!sourceFile->GetPropertyAsBool("GENERATED")) {
|
||||
|
||||
@@ -198,6 +198,8 @@ private:
|
||||
cmGeneratorTarget* target);
|
||||
cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen, cmSourceFile* sf,
|
||||
cmGeneratorTarget* gtgt);
|
||||
void AddXCodeProjBuildRule(cmGeneratorTarget* target,
|
||||
std::vector<cmSourceFile*>& sources) const;
|
||||
bool CreateXCodeTargets(cmLocalGenerator* gen, std::vector<cmXCodeObject*>&);
|
||||
bool IsHeaderFile(cmSourceFile*);
|
||||
void AddDependTarget(cmXCodeObject* target, cmXCodeObject* dependTarget);
|
||||
|
||||
@@ -1347,7 +1347,18 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
|
||||
for (size_t ci = 0; ci < configs.size(); ++ci) {
|
||||
acs.Configs.push_back(ci);
|
||||
}
|
||||
sources.Sources.emplace_back(std::move(acs));
|
||||
bool haveCMakeLists = false;
|
||||
for (cmGeneratorTarget::AllConfigSource& si : sources.Sources) {
|
||||
if (si.Source == sf) {
|
||||
haveCMakeLists = true;
|
||||
// Replace the explicit source reference with our generated one.
|
||||
si = acs;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!haveCMakeLists) {
|
||||
sources.Sources.emplace_back(std::move(acs));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1898,7 +1898,14 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
|
||||
std::vector<cmGeneratorTarget::AllConfigSource> const& sources =
|
||||
this->GeneratorTarget->GetAllConfigSources();
|
||||
|
||||
cmSourceFile const* srcCMakeLists =
|
||||
this->LocalGenerator->CreateVCProjBuildRule();
|
||||
|
||||
for (cmGeneratorTarget::AllConfigSource const& si : sources) {
|
||||
if (si.Source == srcCMakeLists) {
|
||||
// Skip explicit reference to CMakeLists.txt source.
|
||||
continue;
|
||||
}
|
||||
std::string tool;
|
||||
switch (si.Kind) {
|
||||
case cmGeneratorTarget::SourceKindAppManifest:
|
||||
|
||||
Reference in New Issue
Block a user