kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtAutogen: Split initializer methods into separate class.

This commit is contained in:
Stephen Kelly 2015-09-26 18:54:56 +02:00
parent 12f0e13c5f
commit 1e83a963d8
3 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalGenerator.cxx
View File

@ -1269,7 +1269,7 @@ bool cmGlobalGenerator::Compute()
for (std::vector<cmTarget const*>::iterator it = autogenTargets.begin(); for (std::vector<cmTarget const*>::iterator it = autogenTargets.begin();
it != autogenTargets.end(); ++it) it != autogenTargets.end(); ++it)
{ {
cmQtAutoGenerators::SetupAutoGenerateTarget(*it); cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it);
} }
#endif #endif
@ -1451,7 +1451,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
continue; continue;
} }
cmQtAutoGenerators::InitializeAutogenSources(&ti->second); cmQtAutoGeneratorInitializer::InitializeAutogenSources(&ti->second);
targetNames.push_back(ti->second.GetName()); targetNames.push_back(ti->second.GetName());
} }
for(std::vector<std::string>::iterator ti = targetNames.begin(); for(std::vector<std::string>::iterator ti = targetNames.begin();
@ -1459,7 +1459,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
{ {
cmTarget* target = this->LocalGenerators[i] cmTarget* target = this->LocalGenerators[i]
->GetMakefile()->FindTarget(*ti, true); ->GetMakefile()->FindTarget(*ti, true);
cmQtAutoGenerators::InitializeAutogenTarget( cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
this->LocalGenerators[i], target); this->LocalGenerators[i], target);
autogenTargets.push_back(target); autogenTargets.push_back(target);
} }

53
Source/cmQtAutoGenerators.cxx
View File

@ -180,11 +180,12 @@ static std::string cmQtAutoGeneratorsStripCR(std::string const& line)
return line; return line;
} }
std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, std::string cmQtAutoGeneratorInitializer::ListQt5RccInputs(cmSourceFile* sf,
cmTarget const* target, cmTarget const* target,
std::vector<std::string>& depends) std::vector<std::string>& depends)
{ {
std::string rccCommand = cmQtAutoGenerators::GetRccExecutable(target); std::string rccCommand
= cmQtAutoGeneratorInitializer::GetRccExecutable(target);
std::vector<std::string> qrcEntries; std::vector<std::string> qrcEntries;
std::vector<std::string> command; std::vector<std::string> command;
@ -250,7 +251,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf,
return cmJoin(qrcEntries, "@list_sep@"); return cmJoin(qrcEntries, "@list_sep@");
} }
std::string cmQtAutoGenerators::ListQt4RccInputs(cmSourceFile* sf, std::string cmQtAutoGeneratorInitializer::ListQt4RccInputs(cmSourceFile* sf,
std::vector<std::string>& depends) std::vector<std::string>& depends)
{ {
const std::string qrcContents = ReadAll(sf->GetFullPath()); const std::string qrcContents = ReadAll(sf->GetFullPath());
@ -287,7 +288,7 @@ std::string cmQtAutoGenerators::ListQt4RccInputs(cmSourceFile* sf,
} }
void cmQtAutoGenerators::InitializeAutogenSources(cmTarget* target) void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
{ {
cmMakefile* makefile = target->GetMakefile(); cmMakefile* makefile = target->GetMakefile();
@ -306,7 +307,8 @@ void cmQtAutoGenerators::InitializeAutogenSources(cmTarget* target)
} }
} }
void cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg, void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
cmLocalGenerator* lg,
cmTarget* target) cmTarget* target)
{ {
cmMakefile* makefile = target->GetMakefile(); cmMakefile* makefile = target->GetMakefile();
@ -437,11 +439,12 @@ void cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
{ {
if (qtMajorVersion == "5") if (qtMajorVersion == "5")
{ {
cmQtAutoGenerators::ListQt5RccInputs(sf, target, depends); cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf, target,
depends);
} }
else else
{ {
cmQtAutoGenerators::ListQt4RccInputs(sf, depends); cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
} }
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
// Cannot use PRE_BUILD because the resource files themselves // Cannot use PRE_BUILD because the resource files themselves
@ -526,7 +529,8 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
defs += cmJoin(defines, ";"); defs += cmJoin(defines, ";");
} }
void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target) void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmTarget const* target)
{ {
cmMakefile* makefile = target->GetMakefile(); cmMakefile* makefile = target->GetMakefile();
@ -574,24 +578,25 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target)
|| target->GetPropertyAsBool("AUTOUIC") || target->GetPropertyAsBool("AUTOUIC")
|| target->GetPropertyAsBool("AUTORCC")) || target->GetPropertyAsBool("AUTORCC"))
{ {
cmQtAutoGenerators::SetupSourceFiles(target, skipMoc, cmQtAutoGeneratorInitializer::SetupSourceFiles(target, skipMoc,
mocSources, mocHeaders, skipUic); mocSources, mocHeaders, skipUic);
} }
makefile->AddDefinition("_cpp_files", makefile->AddDefinition("_cpp_files",
cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str()); cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
if (target->GetPropertyAsBool("AUTOMOC")) if (target->GetPropertyAsBool("AUTOMOC"))
{ {
cmQtAutoGenerators::SetupAutoMocTarget(target, autogenTargetName, cmQtAutoGeneratorInitializer::SetupAutoMocTarget(target, autogenTargetName,
skipMoc, mocHeaders, skipMoc, mocHeaders,
configIncludes, configDefines); configIncludes, configDefines);
} }
if (target->GetPropertyAsBool("AUTOUIC")) if (target->GetPropertyAsBool("AUTOUIC"))
{ {
cmQtAutoGenerators::SetupAutoUicTarget(target, skipUic, configUicOptions); cmQtAutoGeneratorInitializer::SetupAutoUicTarget(target, skipUic,
configUicOptions);
} }
if (target->GetPropertyAsBool("AUTORCC")) if (target->GetPropertyAsBool("AUTORCC"))
{ {
cmQtAutoGenerators::SetupAutoRccTarget(target); cmQtAutoGeneratorInitializer::SetupAutoRccTarget(target);
} }
const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT"); const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
@ -662,7 +667,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target)
} }
} }
void cmQtAutoGenerators::SetupSourceFiles(cmTarget const* target, void cmQtAutoGeneratorInitializer::SetupSourceFiles(cmTarget const* target,
std::vector<std::string>& skipMoc, std::vector<std::string>& skipMoc,
std::vector<std::string>& mocSources, std::vector<std::string>& mocSources,
std::vector<std::string>& mocHeaders, std::vector<std::string>& mocHeaders,
@ -745,7 +750,7 @@ void cmQtAutoGenerators::SetupSourceFiles(cmTarget const* target,
} }
} }
void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget const* target, void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
const std::string &autogenTargetName, const std::string &autogenTargetName,
std::vector<std::string> const& skipMoc, std::vector<std::string> const& skipMoc,
std::vector<std::string> const& mocHeaders, std::vector<std::string> const& mocHeaders,
@ -893,7 +898,7 @@ static void GetUicOpts(cmTarget const* target, const std::string& config,
optString = cmJoin(opts, ";"); optString = cmJoin(opts, ";");
} }
void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target, void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
std::vector<std::string> const& skipUic, std::vector<std::string> const& skipUic,
std::map<std::string, std::string> &configUicOptions) std::map<std::string, std::string> &configUicOptions)
{ {
@ -1000,7 +1005,8 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
} }
} }
void cmQtAutoGenerators::MergeRccOptions(std::vector<std::string> &opts, void cmQtAutoGeneratorInitializer::MergeRccOptions(
std::vector<std::string> &opts,
const std::vector<std::string> &fileOpts, const std::vector<std::string> &fileOpts,
bool isQt5) bool isQt5)
{ {
@ -1043,7 +1049,7 @@ void cmQtAutoGenerators::MergeRccOptions(std::vector<std::string> &opts,
opts.insert(opts.end(), extraOpts.begin(), extraOpts.end()); opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
} }
void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target) void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
{ {
std::string _rcc_files; std::string _rcc_files;
const char* sepRccFiles = ""; const char* sepRccFiles = "";
@ -1097,7 +1103,7 @@ void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target)
{ {
std::vector<std::string> optsVec; std::vector<std::string> optsVec;
cmSystemTools::ExpandListArgument(prop, optsVec); cmSystemTools::ExpandListArgument(prop, optsVec);
cmQtAutoGenerators::MergeRccOptions(rccOptions, optsVec, cmQtAutoGeneratorInitializer::MergeRccOptions(rccOptions, optsVec,
strcmp(qtVersion, "5") == 0); strcmp(qtVersion, "5") == 0);
} }
@ -1125,12 +1131,14 @@ void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target)
{ {
if (qtMajorVersion == "5") if (qtMajorVersion == "5")
{ {
entriesList = cmQtAutoGenerators::ListQt5RccInputs(sf, target, entriesList = cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf,
target,
depends); depends);
} }
else else
{ {
entriesList = cmQtAutoGenerators::ListQt4RccInputs(sf, depends); entriesList =
cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
} }
if (entriesList.empty()) if (entriesList.empty())
{ {
@ -1155,10 +1163,11 @@ void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target)
cmOutputConverter::EscapeForCMake(rccFileOptions).c_str()); cmOutputConverter::EscapeForCMake(rccFileOptions).c_str());
makefile->AddDefinition("_qt_rcc_executable", makefile->AddDefinition("_qt_rcc_executable",
cmQtAutoGenerators::GetRccExecutable(target).c_str()); cmQtAutoGeneratorInitializer::GetRccExecutable(target).c_str());
} }
std::string cmQtAutoGenerators::GetRccExecutable(cmTarget const* target) std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
cmTarget const* target)
{ {
cmGeneratorTarget *gtgt = target->GetMakefile() cmGeneratorTarget *gtgt = target->GetMakefile()
->GetGlobalGenerator() ->GetGlobalGenerator()

36
Source/cmQtAutoGenerators.h
View File

@ -25,12 +25,9 @@ class cmLocalGenerator;
class cmTarget; class cmTarget;
class cmSourceFile; class cmSourceFile;
class cmQtAutoGenerators class cmQtAutoGeneratorInitializer
{ {
public: public:
cmQtAutoGenerators();
bool Run(const std::string& targetDirectory, const std::string& config);
static void InitializeAutogenSources(cmTarget* target); static void InitializeAutogenSources(cmTarget* target);
static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target); static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target);
static void SetupAutoGenerateTarget(cmTarget const* target); static void SetupAutoGenerateTarget(cmTarget const* target);
@ -53,6 +50,26 @@ private:
std::map<std::string, std::string> &configUicOptions); std::map<std::string, std::string> &configUicOptions);
static void SetupAutoRccTarget(cmTarget const* target); static void SetupAutoRccTarget(cmTarget const* target);
static void MergeRccOptions(std::vector<std::string> &opts,
const std::vector<std::string> &fileOpts, bool isQt5);
static std::string GetRccExecutable(cmTarget const* target);
static std::string ListQt5RccInputs(cmSourceFile* sf, cmTarget const* target,
std::vector<std::string>& depends);
static std::string ListQt4RccInputs(cmSourceFile* sf,
std::vector<std::string>& depends);
};
class cmQtAutoGenerators
{
public:
cmQtAutoGenerators();
bool Run(const std::string& targetDirectory, const std::string& config);
private:
bool ReadAutogenInfoFile(cmMakefile* makefile, bool ReadAutogenInfoFile(cmMakefile* makefile,
const std::string& targetDirectory, const std::string& targetDirectory,
const std::string& config); const std::string& config);
@ -100,17 +117,6 @@ private:
static void MergeUicOptions(std::vector<std::string> &opts, static void MergeUicOptions(std::vector<std::string> &opts,
const std::vector<std::string> &fileOpts, bool isQt5); const std::vector<std::string> &fileOpts, bool isQt5);
static void MergeRccOptions(std::vector<std::string> &opts,
const std::vector<std::string> &fileOpts, bool isQt5);
static std::string GetRccExecutable(cmTarget const* target);
static std::string ListQt5RccInputs(cmSourceFile* sf, cmTarget const* target,
std::vector<std::string>& depends);
static std::string ListQt4RccInputs(cmSourceFile* sf,
std::vector<std::string>& depends);
bool InputFilesNewerThanQrc(const std::string& qrcFile, bool InputFilesNewerThanQrc(const std::string& qrcFile,
const std::string& rccOutput); const std::string& rccOutput);