mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Add AUTOGEN_SOURCE_GROUP support

Browse Source 
Closes: #16501
This commit is contained in:
Sebastian Holtermann
2017-03-15 10:50:23 +01:00
parent 379cf11b30
commit af1354d6c1
1 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -134,6 +134,61 @@ static void AddDefinitionEscaped(cmMakefile* makefile, const char* key,
key, cmOutputConverter::EscapeForCMake(cmJoin(values, ";")).c_str());
}
static bool AddToSourceGroup(cmMakefile* makefile, const std::string& fileName,
cmQtAutoGeneratorCommon::GeneratorType genType)
{
cmSourceGroup* sourceGroup = CM_NULLPTR;
// Acquire source group
{
const char* groupName = CM_NULLPTR;
// Use generator specific group name
switch (genType) {
case cmQtAutoGeneratorCommon::MOC:
groupName =
makefile->GetState()->GetGlobalProperty("AUTOMOC_SOURCE_GROUP");
break;
case cmQtAutoGeneratorCommon::RCC:
groupName =
makefile->GetState()->GetGlobalProperty("AUTORCC_SOURCE_GROUP");
break;
default:
break;
}
// Use default group name on demand
if ((groupName == CM_NULLPTR) || (*groupName == 0)) {
groupName =
makefile->GetState()->GetGlobalProperty("AUTOGEN_SOURCE_GROUP");
}
// Generate a source group on demand
if ((groupName != CM_NULLPTR) && (*groupName != 0)) {
{
const char* delimiter =
makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
if (delimiter == CM_NULLPTR) {
delimiter = "\\";
}
std::vector<std::string> folders =
cmSystemTools::tokenize(groupName, delimiter);
sourceGroup = makefile->GetSourceGroup(folders);
if (sourceGroup == CM_NULLPTR) {
makefile->AddSourceGroup(folders);
sourceGroup = makefile->GetSourceGroup(folders);
}
}
if (sourceGroup == CM_NULLPTR) {
cmSystemTools::Error(
"Autogen: Could not create or find source group: ",
cmQtAutoGeneratorCommon::Quoted(groupName).c_str());
return false;
}
}
}
if (sourceGroup != CM_NULLPTR) {
sourceGroup->AddGroupFile(fileName);
}
return true;
}
static void AcquireScanFiles(cmGeneratorTarget const* target,
std::vector<std::string>& mocUicSources,
std::vector<std::string>& mocUicHeaders,
@@ -531,11 +586,14 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
{
if (target->GetPropertyAsBool("AUTOMOC")) {
cmMakefile* makefile = target->Target->GetMakefile();
const std::string mocCppFile =
GetAutogenTargetBuildDir(target) + "moc_compilation.cpp";
cmSourceFile* gf = makefile->GetOrCreateSource(mocCppFile, true);
gf->SetProperty("SKIP_AUTOGEN", "On");
std::string mocCppFile = GetAutogenTargetBuildDir(target);
mocCppFile += "moc_compilation.cpp";
{
cmSourceFile* gFile = makefile->GetOrCreateSource(mocCppFile, true);
gFile->SetProperty("SKIP_AUTOGEN", "On");
}
target->AddSource(mocCppFile);
AddToSourceGroup(makefile, mocCppFile, cmQtAutoGeneratorCommon::MOC);
}
}
@@ -700,9 +758,12 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
autogenProvides.push_back(rccOut);
// Add rcc output file to origin target sources
cmSourceFile* gf = makefile->GetOrCreateSource(rccOut, true);
gf->SetProperty("SKIP_AUTOGEN", "On");
{
cmSourceFile* gFile = makefile->GetOrCreateSource(rccOut, true);
gFile->SetProperty("SKIP_AUTOGEN", "On");
}
target->AddSource(rccOut);
AddToSourceGroup(makefile, rccOut, cmQtAutoGeneratorCommon::RCC);
}
if (PropertyEnabled(sf, "GENERATED")) {