Merge topic 'autogen-merge-redundant'

15ef2728 Autogen: Add test for OBJECT libraries
362f9bd7 Autogen: Merge and remove redundant function calls
952fc65d Autogen: Clear sources meta data cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1120
This commit is contained in:
Brad King 2017-08-11 13:14:36 +00:00 committed by Kitware Robot
commit 1d51fcaeaf
13 changed files with 146 additions and 46 deletions

View File

@ -326,6 +326,13 @@ std::string cmGeneratorTarget::GetOutputName(
return i->second;
}
void cmGeneratorTarget::ClearSourcesCache()
{
this->KindedSourcesMap.clear();
this->LinkImplementationLanguageIsContextDependent = true;
this->Objects.clear();
}
void cmGeneratorTarget::AddSourceCommon(const std::string& src)
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
@ -333,8 +340,7 @@ void cmGeneratorTarget::AddSourceCommon(const std::string& src)
CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(src);
cge->SetEvaluateForBuildsystem(true);
this->SourceEntries.push_back(new TargetPropertyEntry(cge));
this->KindedSourcesMap.clear();
this->LinkImplementationLanguageIsContextDependent = true;
this->ClearSourcesCache();
}
void cmGeneratorTarget::AddSource(const std::string& src)

View File

@ -491,6 +491,11 @@ public:
std::string GetOutputName(const std::string& config,
cmStateEnums::ArtifactType artifact) const;
/** Clears cached meta data for local and external source files.
* The meta data will be recomputed on demand.
*/
void ClearSourcesCache();
void AddSource(const std::string& src);
void AddTracedSources(std::vector<std::string> const& srcs);

View File

@ -1433,31 +1433,36 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
std::vector<const cmGeneratorTarget*> autogenTargets;
#ifdef CMAKE_BUILD_WITH_CMAKE
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) {
std::vector<cmGeneratorTarget*> targets =
this->LocalGenerators[i]->GetGeneratorTargets();
for (std::vector<cmLocalGenerator*>::const_iterator lgit =
this->LocalGenerators.begin();
lgit != this->LocalGenerators.end(); ++lgit) {
cmLocalGenerator* localGen = *lgit;
const std::vector<cmGeneratorTarget*>& targets =
localGen->GetGeneratorTargets();
// Find targets that require AUTOGEN processing
std::vector<cmGeneratorTarget*> filteredTargets;
filteredTargets.reserve(targets.size());
for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
for (std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
ti != targets.end(); ++ti) {
if ((*ti)->GetType() == cmStateEnums::GLOBAL_TARGET) {
cmGeneratorTarget* target = *ti;
if (target->GetType() == cmStateEnums::GLOBAL_TARGET) {
continue;
}
if ((*ti)->GetType() != cmStateEnums::EXECUTABLE &&
(*ti)->GetType() != cmStateEnums::STATIC_LIBRARY &&
(*ti)->GetType() != cmStateEnums::SHARED_LIBRARY &&
(*ti)->GetType() != cmStateEnums::MODULE_LIBRARY &&
(*ti)->GetType() != cmStateEnums::OBJECT_LIBRARY) {
if (target->GetType() != cmStateEnums::EXECUTABLE &&
target->GetType() != cmStateEnums::STATIC_LIBRARY &&
target->GetType() != cmStateEnums::SHARED_LIBRARY &&
target->GetType() != cmStateEnums::MODULE_LIBRARY &&
target->GetType() != cmStateEnums::OBJECT_LIBRARY) {
continue;
}
if ((!(*ti)->GetPropertyAsBool("AUTOMOC") &&
!(*ti)->GetPropertyAsBool("AUTOUIC") &&
!(*ti)->GetPropertyAsBool("AUTORCC")) ||
(*ti)->IsImported()) {
if ((!target->GetPropertyAsBool("AUTOMOC") &&
!target->GetPropertyAsBool("AUTOUIC") &&
!target->GetPropertyAsBool("AUTORCC")) ||
target->IsImported()) {
continue;
}
// don't do anything if there is no Qt4 or Qt5Core (which contains moc):
cmMakefile* mf = (*ti)->Target->GetMakefile();
// don't do anything if there is no Qt4 or Qt5Core (which contains moc)
cmMakefile* mf = target->Target->GetMakefile();
std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR");
if (qtMajorVersion == "") {
qtMajorVersion = mf->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
@ -1465,17 +1470,13 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
if (qtMajorVersion != "4" && qtMajorVersion != "5") {
continue;
}
cmGeneratorTarget* gt = *ti;
cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
filteredTargets.push_back(gt);
filteredTargets.push_back(target);
}
// Initialize AUTOGEN targets
for (std::vector<cmGeneratorTarget*>::iterator ti =
filteredTargets.begin();
ti != filteredTargets.end(); ++ti) {
cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
this->LocalGenerators[i], *ti);
cmQtAutoGeneratorInitializer::InitializeAutogenTarget(localGen, *ti);
autogenTargets.push_back(*ti);
}
}

View File

@ -263,13 +263,17 @@ static bool AddToSourceGroup(cmMakefile* makefile, const std::string& fileName,
return true;
}
static void AddGeneratedSource(cmMakefile* makefile,
static void AddGeneratedSource(cmGeneratorTarget* target,
const std::string& filename,
cmQtAutoGeneratorCommon::GeneratorType genType)
{
cmSourceFile* gFile = makefile->GetOrCreateSource(filename, true);
gFile->SetProperty("GENERATED", "1");
gFile->SetProperty("SKIP_AUTOGEN", "On");
cmMakefile* makefile = target->Target->GetMakefile();
{
cmSourceFile* gFile = makefile->GetOrCreateSource(filename, true);
gFile->SetProperty("GENERATED", "1");
gFile->SetProperty("SKIP_AUTOGEN", "On");
}
target->AddSource(filename);
AddToSourceGroup(makefile, filename, genType);
}
@ -692,19 +696,6 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target,
AddDefinitionEscaped(makefile, "_rcc_options_options", rccFileOptions);
}
void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
cmGeneratorTarget* target)
{
if (target->GetPropertyAsBool("AUTOMOC")) {
cmMakefile* makefile = target->Target->GetMakefile();
// Mocs compilation file
const std::string mocsComp =
GetAutogenTargetBuildDir(target) + "/mocs_compilation.cpp";
AddGeneratedSource(makefile, mocsComp, cmQtAutoGeneratorCommon::MOC);
target->AddSource(mocsComp);
}
}
void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
cmLocalGenerator* lg, cmGeneratorTarget* target)
{
@ -781,6 +772,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
// Add moc compilation to generated files list
if (mocEnabled) {
const std::string mocsComp = autogenBuildDir + "/mocs_compilation.cpp";
AddGeneratedSource(target, mocsComp, cmQtAutoGeneratorCommon::MOC);
autogenProvides.push_back(mocsComp);
}
@ -880,10 +872,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
rccBuildFile += ".cpp";
// Register rcc ouput file as generated
AddGeneratedSource(makefile, rccBuildFile,
AddGeneratedSource(target, rccBuildFile,
cmQtAutoGeneratorCommon::RCC);
// Add rcc output file to origin target sources
target->AddSource(rccBuildFile);
// Register rcc ouput file as generated by the _autogen target
autogenProvides.push_back(rccBuildFile);
}
@ -919,6 +909,12 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
}
}
// cmGeneratorTarget::GetConfigCommonSourceFiles computes the target's
// sources meta data cache. Clear it so that OBJECT library targets that
// are AUTOGEN initialized after this target get their added
// mocs_compilation.cpp source acknowledged by this target.
target->ClearSourcesCache();
// Convert std::set to std::vector
const std::vector<std::string> autogenDepends(autogenDependsSet.begin(),
autogenDependsSet.end());

View File

@ -11,7 +11,6 @@ class cmLocalGenerator;
class cmQtAutoGeneratorInitializer
{
public:
static void InitializeAutogenSources(cmGeneratorTarget* target);
static void InitializeAutogenTarget(cmLocalGenerator* lg,
cmGeneratorTarget* target);
static void SetupAutoGenerateTarget(cmGeneratorTarget const* target);

View File

@ -192,6 +192,10 @@ endif()
# Tests various .ui include directories
add_subdirectory(uicInclude)
# -- Test
# OBJECT libraries
add_subdirectory(objectLibrary)
# -- Test
# Complex test case
add_subdirectory(complex)

View File

@ -0,0 +1,14 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
# Object library a defined in a subdirectory
add_subdirectory(a)
# Object library b defined locally
include_directories(b)
add_library(b OBJECT b/classb.cpp)
target_compile_features(b PRIVATE ${QT_COMPILE_FEATURES})
# Executable with OBJECT library generator expressions
add_executable(someProgram main.cpp $<TARGET_OBJECTS:a> $<TARGET_OBJECTS:b>)
target_link_libraries(someProgram ${QT_LIBRARIES})

View File

@ -0,0 +1,2 @@
add_library(a OBJECT classa.cpp)
target_compile_features(a PRIVATE ${QT_COMPILE_FEATURES})

View File

@ -0,0 +1,7 @@
#include "classa.h"
#include <QDebug>
void ClassA::slotDoSomething()
{
qDebug() << m_member;
}

View File

@ -0,0 +1,23 @@
#ifndef CLASSA_H
#define CLASSA_H
#include <QObject>
#include <QString>
class ClassA : public QObject
{
Q_OBJECT
public:
ClassA()
: m_member("Hello A")
{
}
public slots:
void slotDoSomething();
private:
QString m_member;
};
#endif

View File

@ -0,0 +1,7 @@
#include "classb.h"
#include <QDebug>
void ClassB::slotDoSomething()
{
qDebug() << m_member;
}

View File

@ -0,0 +1,23 @@
#ifndef CLASSB_H
#define CLASSB_H
#include <QObject>
#include <QString>
class ClassB : public QObject
{
Q_OBJECT
public:
ClassB()
: m_member("Hello B")
{
}
public slots:
void slotDoSomething();
private:
QString m_member;
};
#endif

View File

@ -0,0 +1,13 @@
#include "a/classa.h"
#include "b/classb.h"
int main(int argc, char** argv)
{
ClassA a;
a.slotDoSomething();
ClassB b;
b.slotDoSomething();
return 0;
}