reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-21 02:45:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUTOGEN: Rename config variables

Browse Source 
The new names describe the variables use cases better.
This commit is contained in:
Sebastian Holtermann 2016-12-28 11:56:20 +01:00
parent 63d3ca4c1c
commit e7280a7f17
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/AutogenInfo.cmake.in
View File

@ -1,7 +1,7 @@
set(AM_SOURCES @_cpp_files@ )
set(AM_SKIP_MOC @_skip_moc@ )
set(AM_SKIP_UIC @_skip_uic@ )
set(AM_HEADERS @_moc_headers@ )
set(AM_SOURCES @_moc_uic_sources@)
set(AM_HEADERS @_moc_uic_headers@)
set(AM_SKIP_MOC @_skip_moc@)
set(AM_SKIP_UIC @_skip_uic@)
set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
set(AM_MOC_INCLUDES @_moc_incs@)
set(AM_MOC_OPTIONS @_moc_options@)

32
Source/cmQtAutoGeneratorInitializer.cxx
View File

@ -99,9 +99,9 @@ static std::string GetQtMajorVersion(cmGeneratorTarget const* target)
}
static void SetupSourceFiles(cmGeneratorTarget const* target,
std::vector<std::string>& mocUicSources,
std::vector<std::string>& mocUicHeaders,
std::vector<std::string>& skipMoc,
std::vector<std::string>& sources,
std::vector<std::string>& headers,
std::vector<std::string>& skipUic)
{
cmMakefile* makefile = target->Target->GetMakefile();
@ -136,9 +136,9 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
cmsys::SystemTools::GetRealPath(sf->GetFullPath());
// Add file name to sources or headers list
if (fileType == cmSystemTools::CXX_FILE_FORMAT) {
sources.push_back(absFile);
mocUicSources.push_back(absFile);
} else if (fileType == cmSystemTools::HEADER_FILE_FORMAT) {
headers.push_back(absFile);
mocUicHeaders.push_back(absFile);
}
// Add file name to skip lists on demand
if (fileSkipUic) {
@ -171,7 +171,6 @@ static void GetCompileDefinitionsAndDirectories(
static void MocSetupAutoTarget(
cmGeneratorTarget const* target, const std::string& autogenTargetName,
std::vector<std::string> const& skipMoc,
std::vector<std::string> const& mocHeaders,
std::map<std::string, std::string>& configIncludes,
std::map<std::string, std::string>& configDefines)
{
@ -185,9 +184,6 @@ static void MocSetupAutoTarget(
makefile->AddDefinition(
"_skip_moc",
cmOutputConverter::EscapeForCMake(cmJoin(skipMoc, ";")).c_str());
makefile->AddDefinition(
"_moc_headers",
cmOutputConverter::EscapeForCMake(cmJoin(mocHeaders, ";")).c_str());
bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE");
@ -863,10 +859,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
cmOutputConverter::EscapeForCMake(target->GetName()).c_str());
makefile->AddDefinition("_target_qt_version", qtMajorVersion.c_str());
std::vector<std::string> skipUic;
std::vector<std::string> mocUicSources;
std::vector<std::string> mocUicHeaders;
std::vector<std::string> skipMoc;
std::vector<std::string> mocSources;
std::vector<std::string> mocHeaders;
std::vector<std::string> skipUic;
std::map<std::string, std::string> configMocIncludes;
std::map<std::string, std::string> configMocDefines;
std::map<std::string, std::string> configUicOptions;
@ -874,14 +870,18 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
if (target->GetPropertyAsBool("AUTOMOC") ||
target->GetPropertyAsBool("AUTOUIC") ||
target->GetPropertyAsBool("AUTORCC")) {
SetupSourceFiles(target, skipMoc, mocSources, mocHeaders, skipUic);
SetupSourceFiles(target, mocUicSources, mocUicHeaders, skipMoc, skipUic);
}
makefile->AddDefinition(
"_cpp_files",
cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
"_moc_uic_sources",
cmOutputConverter::EscapeForCMake(cmJoin(mocUicSources, ";")).c_str());
makefile->AddDefinition(
"_moc_uic_headers",
cmOutputConverter::EscapeForCMake(cmJoin(mocUicHeaders, ";")).c_str());
if (target->GetPropertyAsBool("AUTOMOC")) {
MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders,
configMocIncludes, configMocDefines);
MocSetupAutoTarget(target, autogenTargetName, skipMoc, configMocIncludes,
configMocDefines);
}
if (target->GetPropertyAsBool("AUTOUIC")) {
UicSetupAutoTarget(target, skipUic, configUicOptions);