[Cmake-commits] CMake branch, next, updated. v2.8.12-3981-ge36c250
Brad King
brad.king at kitware.com
Tue Oct 15 13:45:24 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e36c25030006b8fbbfe3b70e9b847f7810824bab (commit)
via 81b03fbba7211617880997c4d79fe1eda7365477 (commit)
from c4d64207cf524c02b5a6600123d035c1f4900bfe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36c25030006b8fbbfe3b70e9b847f7810824bab
commit e36c25030006b8fbbfe3b70e9b847f7810824bab
Merge: c4d6420 81b03fb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 15 13:45:12 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 15 13:45:12 2013 -0400
Merge topic 'Qt-auto-generators' into next
81b03fb Revert topic 'Qt-auto-generators'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81b03fbba7211617880997c4d79fe1eda7365477
commit 81b03fbba7211617880997c4d79fe1eda7365477
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 15 13:40:05 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 15 13:40:16 2013 -0400
Revert topic 'Qt-auto-generators'
It will be rebased after the documentation transition.
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in
deleted file mode 100644
index 8e38d86..0000000
--- a/Modules/AutogenInfo.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-set(AM_SOURCES @_moc_files@ )
-set(AM_RCC_SOURCES @_rcc_files@ )
-set(AM_SKIP_MOC @_skip_moc@ )
-set(AM_SKIP_UIC @_skip_uic@ )
-set(AM_HEADERS @_moc_headers@ )
-set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
-set(AM_MOC_INCLUDES @_moc_incs@)
-set(AM_MOC_OPTIONS @_moc_options@)
-set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@")
-set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/")
-set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/")
-set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@")
-set(AM_QT_UIC_EXECUTABLE "@_qt_uic_executable@")
-set(AM_QT_RCC_EXECUTABLE "@_qt_rcc_executable@")
-set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
-set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
-set(AM_QT_VERSION_MAJOR "@_target_qt_version@")
-set(AM_TARGET_NAME @_moc_target_name@)
-set(AM_RELAXED_MODE "@_moc_relaxed_mode@")
-set(AM_UIC_OPTIONS_FILES @_qt_uic_options_files@)
-set(AM_UIC_OPTIONS_OPTIONS @_qt_uic_options_options@)
-set(AM_RCC_OPTIONS_FILES @_qt_rcc_options_files@)
-set(AM_RCC_OPTIONS_OPTIONS @_qt_rcc_options_options@)
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in
new file mode 100644
index 0000000..9cff735
--- /dev/null
+++ b/Modules/AutomocInfo.cmake.in
@@ -0,0 +1,14 @@
+set(AM_SOURCES @_moc_files@ )
+set(AM_HEADERS @_moc_headers@ )
+set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
+set(AM_MOC_INCLUDES @_moc_incs@)
+set(AM_MOC_OPTIONS @_moc_options@)
+set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@")
+set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/")
+set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/")
+set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@")
+set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
+set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
+set(AM_QT_VERSION_MAJOR "@_target_qt_version@")
+set(AM_TARGET_NAME @_moc_target_name@)
+set(AM_RELAXED_MODE "@_moc_relaxed_mode@")
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 84c13d4..9b81e8b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -259,8 +259,8 @@ set(SRCS
cmPropertyDefinitionMap.h
cmPropertyMap.cxx
cmPropertyMap.h
- cmQtAutoGenerators.cxx
- cmQtAutoGenerators.h
+ cmQtAutomoc.cxx
+ cmQtAutomoc.h
cmScriptGenerator.h
cmScriptGenerator.cxx
cmSourceFile.cxx
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 051c146..58634ea 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1336,24 +1336,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables that Control the Build");
cm->DefineProperty
- ("CMAKE_AUTOUIC", cmProperty::VARIABLE,
- "Whether to handle uic automatically for Qt targets.",
- "This variable is used to initialize the "
- "AUTOUIC property on all the targets. "
- "See that target property for additional information.",
- false,
- "Variables that Control the Build");
-
- cm->DefineProperty
- ("CMAKE_AUTORCC", cmProperty::VARIABLE,
- "Whether to handle rcc automatically for Qt targets.",
- "This variable is used to initialize the "
- "AUTORCC property on all the targets. "
- "See that target property for additional information.",
- false,
- "Variables that Control the Build");
-
- cm->DefineProperty
("CMAKE_AUTOMOC_MOC_OPTIONS", cmProperty::VARIABLE,
"Additional options for moc when using automoc (see CMAKE_AUTOMOC).",
"This variable is used to initialize the "
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d3509a0..eacf85b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -18,7 +18,7 @@
#include "cmExternalMakefileProjectGenerator.h"
#include "cmake.h"
#include "cmMakefile.h"
-#include "cmQtAutoGenerators.h"
+#include "cmQtAutomoc.h"
#include "cmSourceFile.h"
#include "cmVersion.h"
#include "cmTargetExport.h"
@@ -1006,8 +1006,8 @@ void cmGlobalGenerator::Generate()
}
// Iterate through all targets and set up automoc for those which have
- // the AUTOMOC, AUTOUIC or AUTORCC property set
- this->CreateQtAutoGeneratorsTargets();
+ // the AUTOMOC property set
+ this->CreateAutomocTargets();
// For each existing cmLocalGenerator
unsigned int i;
@@ -1150,11 +1150,11 @@ bool cmGlobalGenerator::CheckTargets()
}
//----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
+void cmGlobalGenerator::CreateAutomocTargets()
{
#ifdef CMAKE_BUILD_WITH_CMAKE
- typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Autogens;
- Autogens autogens;
+ typedef std::vector<std::pair<cmQtAutomoc, cmTarget*> > Automocs;
+ Automocs automocs;
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
cmTargets& targets =
@@ -1169,24 +1169,21 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
target.GetType() == cmTarget::MODULE_LIBRARY ||
target.GetType() == cmTarget::OBJECT_LIBRARY)
{
- if((target.GetPropertyAsBool("AUTOMOC")
- || target.GetPropertyAsBool("AUTOUIC")
- || target.GetPropertyAsBool("AUTORCC"))
- && !target.IsImported())
+ if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported())
{
- cmQtAutoGenerators autogen;
- if(autogen.InitializeMocSourceFile(&target))
+ cmQtAutomoc automoc;
+ if(automoc.InitializeMocSourceFile(&target))
{
- autogens.push_back(std::make_pair(autogen, &target));
+ automocs.push_back(std::make_pair(automoc, &target));
}
}
}
}
}
- for (Autogens::iterator it = autogens.begin(); it != autogens.end();
+ for (Automocs::iterator it = automocs.begin(); it != automocs.end();
++it)
{
- it->first.SetupAutoGenerateTarget(it->second);
+ it->first.SetupAutomocTarget(it->second);
}
#endif
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 4308e3a..70f6e32 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -311,7 +311,7 @@ protected:
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS();
bool CheckTargets();
- void CreateQtAutoGeneratorsTargets();
+ void CreateAutomocTargets();
// Fill the ProjectMap, this must be called after LocalGenerators
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b94740c..40e55c2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4682,13 +4682,3 @@ void cmMakefile::RecordPolicies(cmPolicies::PolicyMap& pm)
pm[pid] = this->GetPolicyStatus(pid);
}
}
-
-void cmMakefile::AddQtUiFileWithOptions(cmSourceFile *sf)
-{
- this->QtUiFilesWithOptions.push_back(sf);
-}
-
-std::vector<cmSourceFile*> cmMakefile::GetQtUiFilesWithOptions() const
-{
- return this->QtUiFilesWithOptions;
-}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index dc62944..362b066 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -899,9 +899,6 @@ public:
std::set<cmStdString> const & GetSystemIncludeDirectories() const
{ return this->SystemIncludeDirectories; }
- void AddQtUiFileWithOptions(cmSourceFile *sf);
- std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const;
-
protected:
// add link libraries and directories to the target
void AddGlobalLinkInformation(const char* name, cmTarget& target);
@@ -1077,8 +1074,6 @@ private:
cmSourceFile* source);
void UpdateOutputToSourceMap(std::string const& output,
cmSourceFile* source);
-
- std::vector<cmSourceFile*> QtUiFilesWithOptions;
};
//----------------------------------------------------------------------------
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutomoc.cxx
similarity index 64%
rename from Source/cmQtAutoGenerators.cxx
rename to Source/cmQtAutomoc.cxx
index a94d415..651e0ad 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -29,7 +29,7 @@
#include <unistd.h>
#endif
-#include "cmQtAutoGenerators.h"
+#include "cmQtAutomoc.h"
static bool requiresMocing(const std::string& text, std::string ¯oName)
@@ -113,12 +113,10 @@ static void copyTargetProperty(cmTarget* destinationTarget,
}
-cmQtAutoGenerators::cmQtAutoGenerators()
+cmQtAutomoc::cmQtAutomoc()
:Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
,ColorOutput(true)
,RunMocFailed(false)
-,RunUicFailed(false)
-,RunRccFailed(false)
,GenerateAll(false)
{
@@ -137,7 +135,7 @@ cmQtAutoGenerators::cmQtAutoGenerators()
}
}
-bool cmQtAutoGenerators::InitializeMocSourceFile(cmTarget* target)
+bool cmQtAutomoc::InitializeMocSourceFile(cmTarget* target)
{
cmMakefile* makefile = target->GetMakefile();
// don't do anything if there is no Qt4 or Qt5Core (which contains moc):
@@ -151,22 +149,18 @@ bool cmQtAutoGenerators::InitializeMocSourceFile(cmTarget* target)
return false;
}
- if (target->GetPropertyAsBool("AUTOMOC"))
- {
- std::string automocTargetName = target->GetName();
- automocTargetName += "_automoc";
- std::string mocCppFile = makefile->GetCurrentOutputDirectory();
- mocCppFile += "/";
- mocCppFile += automocTargetName;
- mocCppFile += ".cpp";
- cmSourceFile* mocCppSource = makefile->GetOrCreateSource(
- mocCppFile.c_str(),
- true);
- makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
- mocCppFile.c_str(), false);
-
- target->AddSourceFile(mocCppSource);
- }
+ std::string automocTargetName = target->GetName();
+ automocTargetName += "_automoc";
+ std::string mocCppFile = makefile->GetCurrentOutputDirectory();
+ mocCppFile += "/";
+ mocCppFile += automocTargetName;
+ mocCppFile += ".cpp";
+ cmSourceFile* mocCppSource = makefile->GetOrCreateSource(mocCppFile.c_str(),
+ true);
+ makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
+ mocCppFile.c_str(), false);
+
+ target->AddSourceFile(mocCppSource);
return true;
}
@@ -207,46 +201,27 @@ static void GetCompileDefinitionsAndDirectories(cmTarget *target,
}
}
-void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
+void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
{
cmMakefile* makefile = target->GetMakefile();
const char* targetName = target->GetName();
- // forget the variables added here afterwards again:
- cmMakefile::ScopePushPop varScope(makefile);
- static_cast<void>(varScope);
-
- const char *qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR");
- if (!qtVersion)
- {
- qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
- }
- if (const char *targetQtVersion =
- target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", 0))
- {
- qtVersion = targetQtVersion;
- }
- if (qtVersion)
- {
- makefile->AddDefinition("_target_qt_version", qtVersion);
- }
- // create a custom target for running generators at buildtime:
- std::string autogenTargetName = targetName;
- autogenTargetName += "_automoc";
+ bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
- makefile->AddDefinition("_moc_target_name",
- cmLocalGenerator::EscapeForCMake(autogenTargetName.c_str()).c_str());
+ // create a custom target for running automoc at buildtime:
+ std::string automocTargetName = targetName;
+ automocTargetName += "_automoc";
std::string targetDir = makefile->GetCurrentOutputDirectory();
targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
targetDir += "/";
- targetDir += autogenTargetName;
+ targetDir += automocTargetName;
targetDir += ".dir/";
cmCustomCommandLine currentLine;
currentLine.push_back(makefile->GetSafeDefinition("CMAKE_COMMAND"));
currentLine.push_back("-E");
- currentLine.push_back("cmake_autogen");
+ currentLine.push_back("cmake_automoc");
currentLine.push_back(targetDir);
currentLine.push_back("$<CONFIGURATION>");
@@ -257,33 +232,8 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
"", makefile->GetCurrentOutputDirectory());
std::vector<std::string> depends;
- std::vector<std::string> toolNames;
- if (target->GetPropertyAsBool("AUTOMOC"))
- {
- toolNames.push_back("moc");
- }
- if (target->GetPropertyAsBool("AUTOUIC"))
- {
- toolNames.push_back("uic");
- }
- if (target->GetPropertyAsBool("AUTORCC"))
- {
- toolNames.push_back("rcc");
- }
-
- std::string tools = toolNames[0];
- toolNames.erase(toolNames.begin());
- while (toolNames.size() > 1)
- {
- tools += ", " + toolNames[0];
- toolNames.erase(toolNames.begin());
- }
- if (toolNames.size() == 1)
- {
- tools += " and " + toolNames[0];
- }
- std::string autogenComment = "Automatic " + tools + " for target ";
- autogenComment += targetName;
+ std::string automocComment = "Automoc for target ";
+ automocComment += targetName;
#if defined(_WIN32) && !defined(__CYGWIN__)
bool usePRE_BUILD = false;
@@ -306,7 +256,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
// PRE_BUILD will work for an OBJECT_LIBRARY in this specific case.
std::vector<std::string> no_output;
cmCustomCommand cc(makefile, no_output, depends,
- commandLines, autogenComment.c_str(),
+ commandLines, automocComment.c_str(),
workingDirectory.c_str());
cc.SetEscapeOldStyle(false);
cc.SetEscapeAllowMakeVars(true);
@@ -315,97 +265,27 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
else
#endif
{
- cmTarget* autogenTarget = makefile->AddUtilityCommand(
- autogenTargetName.c_str(), true,
+ cmTarget* automocTarget = makefile->AddUtilityCommand(
+ automocTargetName.c_str(), true,
workingDirectory.c_str(), depends,
- commandLines, false, autogenComment.c_str());
+ commandLines, false, automocComment.c_str());
// Set target folder
- const char* autogenFolder = makefile->GetCMakeInstance()->GetProperty(
+ const char* automocFolder = makefile->GetCMakeInstance()->GetProperty(
"AUTOMOC_TARGETS_FOLDER");
- if (!autogenFolder)
+ if (automocFolder && *automocFolder)
{
- autogenFolder = makefile->GetCMakeInstance()->GetProperty(
- "AUTOGEN_TARGETS_FOLDER");
- }
- if (autogenFolder && *autogenFolder)
- {
- autogenTarget->SetProperty("FOLDER", autogenFolder);
+ automocTarget->SetProperty("FOLDER", automocFolder);
}
else
{
// inherit FOLDER property from target (#13688)
- copyTargetProperty(autogenTarget, target, "FOLDER");
+ copyTargetProperty(automocTarget, target, "FOLDER");
}
- target->AddUtility(autogenTargetName.c_str());
- }
-
- std::map<std::string, std::string> configIncludes;
- std::map<std::string, std::string> configDefines;
-
- if (target->GetPropertyAsBool("AUTOMOC"))
- {
- this->SetupAutoMocTarget(target, autogenTargetName,
- configIncludes, configDefines);
- }
- if (target->GetPropertyAsBool("AUTOUIC"))
- {
- this->SetupAutoUicTarget(target);
- }
- if (target->GetPropertyAsBool("AUTORCC"))
- {
- this->SetupAutoRccTarget(target);
- }
-
- const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
- std::string inputFile = cmakeRoot;
- inputFile += "/Modules/AutogenInfo.cmake.in";
- std::string outputFile = targetDir;
- outputFile += "/AutogenInfo.cmake";
- makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(),
- false, true, false);
-
- if (!configDefines.empty() || !configIncludes.empty())
- {
- std::ofstream infoFile(outputFile.c_str(), std::ios::app);
- if ( !infoFile )
- {
- std::string error = "Internal CMake error when trying to open file: ";
- error += outputFile.c_str();
- error += " for writing.";
- cmSystemTools::Error(error.c_str());
- return;
- }
- if (!configDefines.empty())
- {
- for (std::map<std::string, std::string>::iterator
- it = configDefines.begin(), end = configDefines.end();
- it != end; ++it)
- {
- infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first <<
- " " << it->second << ")\n";
- }
- }
- if (!configIncludes.empty())
- {
- for (std::map<std::string, std::string>::iterator
- it = configIncludes.begin(), end = configIncludes.end();
- it != end; ++it)
- {
- infoFile << "set(AM_MOC_INCLUDES_" << it->first <<
- " " << it->second << ")\n";
- }
- }
+ target->AddUtility(automocTargetName.c_str());
}
-}
-
-void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
- const std::string &autogenTargetName,
- std::map<std::string, std::string> &configIncludes,
- std::map<std::string, std::string> &configDefines)
-{
- cmMakefile* makefile = target->GetMakefile();
+ // configure a file to get all information to automoc at buildtime:
std::string _moc_files;
std::string _moc_headers;
const char* sepFiles = "";
@@ -413,9 +293,6 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
- std::string skip_moc;
- const char *sep = "";
-
for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
fileIt != srcFiles.end();
++fileIt)
@@ -426,46 +303,41 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
- if (!generated)
+ if ((skip==false) && (generated == false))
{
- if (skip)
+ std::string ext = sf->GetExtension();
+ cmSystemTools::FileFormat fileType = cmSystemTools::GetFileFormat(
+ ext.c_str());
+ if (fileType == cmSystemTools::CXX_FILE_FORMAT)
{
- skip_moc += sep;
- skip_moc += absFile;
- sep = ";";
+ _moc_files += sepFiles;
+ _moc_files += absFile;
+ sepFiles = ";";
}
- else
+ else if (fileType == cmSystemTools::HEADER_FILE_FORMAT)
{
- std::string ext = sf->GetExtension();
- cmSystemTools::FileFormat fileType = cmSystemTools::GetFileFormat(
- ext.c_str());
- if (fileType == cmSystemTools::CXX_FILE_FORMAT)
- {
- _moc_files += sepFiles;
- _moc_files += absFile;
- sepFiles = ";";
- }
- else if (fileType == cmSystemTools::HEADER_FILE_FORMAT)
- {
- _moc_headers += sepHeaders;
- _moc_headers += absFile;
- sepHeaders = ";";
- }
+ _moc_headers += sepHeaders;
+ _moc_headers += absFile;
+ sepHeaders = ";";
}
}
}
const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
std::string _moc_options = (tmp!=0 ? tmp : "");
+
+ // forget the variables added here afterwards again:
+ cmMakefile::ScopePushPop varScope(makefile);
+ static_cast<void>(varScope);
+
+ makefile->AddDefinition("_moc_target_name",
+ cmLocalGenerator::EscapeForCMake(automocTargetName.c_str()).c_str());
makefile->AddDefinition("_moc_options",
cmLocalGenerator::EscapeForCMake(_moc_options.c_str()).c_str());
makefile->AddDefinition("_moc_files",
cmLocalGenerator::EscapeForCMake(_moc_files.c_str()).c_str());
- makefile->AddDefinition("_skip_moc",
- cmLocalGenerator::EscapeForCMake(skip_moc.c_str()).c_str());
makefile->AddDefinition("_moc_headers",
cmLocalGenerator::EscapeForCMake(_moc_headers.c_str()).c_str());
- bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE");
std::string _moc_incs;
@@ -480,6 +352,9 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
makefile->AddDefinition("_moc_compile_defs",
cmLocalGenerator::EscapeForCMake(_moc_compile_defs.c_str()).c_str());
+ std::map<std::string, std::string> configIncludes;
+ std::map<std::string, std::string> configDefines;
+
for (std::vector<std::string>::const_iterator li = configs.begin();
li != configs.end(); ++li)
{
@@ -508,17 +383,33 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
}
}
+ const char *qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR");
+ if (!qtVersion)
+ {
+ qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
+ }
+ if (const char *targetQtVersion =
+ target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", 0))
+ {
+ qtVersion = targetQtVersion;
+ }
+ if (qtVersion)
+ {
+ makefile->AddDefinition("_target_qt_version", qtVersion);
+ }
+
+ {
const char *qtMoc = makefile->GetSafeDefinition("QT_MOC_EXECUTABLE");
makefile->AddDefinition("_qt_moc_executable", qtMoc);
+ }
- const char *qtVersion = makefile->GetDefinition("_target_qt_version");
if (strcmp(qtVersion, "5") == 0)
{
cmTarget *qt5Moc = makefile->FindTargetToUse("Qt5::moc");
if (!qt5Moc)
{
cmSystemTools::Error("Qt5::moc target not found ",
- autogenTargetName.c_str());
+ automocTargetName.c_str());
return;
}
makefile->AddDefinition("_qt_moc_executable", qt5Moc->GetLocation(0));
@@ -528,208 +419,68 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
if (strcmp(qtVersion, "4") != 0)
{
cmSystemTools::Error("The CMAKE_AUTOMOC feature supports only Qt 4 and "
- "Qt 5 ", autogenTargetName.c_str());
+ "Qt 5 ", automocTargetName.c_str());
}
}
-}
-
-void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target)
-{
- cmMakefile *makefile = target->GetMakefile();
-
- const char *qtUic = makefile->GetSafeDefinition("QT_UIC_EXECUTABLE");
- makefile->AddDefinition("_qt_uic_executable", qtUic);
-
- const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
-
- std::string skip_uic;
- const char *sep = "";
- for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
- fileIt != srcFiles.end();
- ++fileIt)
- {
- cmSourceFile* sf = *fileIt;
- std::string absFile = cmsys::SystemTools::GetRealPath(
- sf->GetFullPath().c_str());
- bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
-
- if (skip)
- {
- skip_uic += sep;
- skip_uic += absFile;
- sep = ";";
- }
- }
-
- makefile->AddDefinition("_skip_uic",
- cmLocalGenerator::EscapeForCMake(skip_uic.c_str()).c_str());
-
- std::vector<cmSourceFile*> uiFilesWithOptions
- = makefile->GetQtUiFilesWithOptions();
-
- std::string uiFileFiles;
- std::string uiFileOptions;
- sep = "";
-
- for(std::vector<cmSourceFile*>::const_iterator fileIt =
- uiFilesWithOptions.begin();
- fileIt != uiFilesWithOptions.end();
- ++fileIt)
- {
- cmSourceFile* sf = *fileIt;
- std::string absFile = cmsys::SystemTools::GetRealPath(
- sf->GetFullPath().c_str());
- uiFileFiles += sep;
- uiFileFiles += absFile;
- uiFileOptions += sep;
- std::string opts = sf->GetProperty("AUTOUIC_OPTIONS");
- cmSystemTools::ReplaceString(opts, ";", "@list_sep@");
- uiFileOptions += opts;
- sep = ";";
- }
-
- makefile->AddDefinition("_qt_uic_options_files",
- cmLocalGenerator::EscapeForCMake(uiFileFiles.c_str()).c_str());
- makefile->AddDefinition("_qt_uic_options_options",
- cmLocalGenerator::EscapeForCMake(uiFileOptions.c_str()).c_str());
+ const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
+ std::string inputFile = cmakeRoot;
+ inputFile += "/Modules/AutomocInfo.cmake.in";
+ std::string outputFile = targetDir;
+ outputFile += "/AutomocInfo.cmake";
+ makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(),
+ false, true, false);
- const char* targetName = target->GetName();
- const char *qtVersion = makefile->GetDefinition("_target_qt_version");
- if (strcmp(qtVersion, "5") == 0)
+ if (!configDefines.empty() || !configIncludes.empty())
{
- cmTarget *qt5Uic = makefile->FindTargetToUse("Qt5::uic");
- if (!qt5Uic)
+ std::ofstream infoFile(outputFile.c_str(), std::ios::app);
+ if ( !infoFile )
{
- cmSystemTools::Error("Qt5::uic target not found ",
- targetName);
+ std::string error = "Internal CMake error when trying to open file: ";
+ error += outputFile.c_str();
+ error += " for writing.";
+ cmSystemTools::Error(error.c_str());
return;
}
- makefile->AddDefinition("_qt_uic_executable", qt5Uic->GetLocation(0));
- }
- else
- {
- if (strcmp(qtVersion, "4") != 0)
- {
- cmSystemTools::Error("The CMAKE_AUTOUIC feature supports only Qt 4 and "
- "Qt 5 ", targetName);
- }
- }
-}
-
-void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget* target)
-{
- std::string _rcc_files;
- const char* sepRccFiles = "";
- cmMakefile *makefile = target->GetMakefile();
-
- std::vector<cmSourceFile*> newFiles;
-
- const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
-
- std::string rccFileFiles;
- std::string rccFileOptions;
- const char *sep = "";
-
- for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
- fileIt != srcFiles.end();
- ++fileIt)
- {
- cmSourceFile* sf = *fileIt;
- std::string ext = sf->GetExtension();
- if (ext == "qrc")
+ if (!configDefines.empty())
{
- std::string absFile = cmsys::SystemTools::GetRealPath(
- sf->GetFullPath().c_str());
- bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"));
-
- if (!skip)
+ for (std::map<std::string, std::string>::iterator
+ it = configDefines.begin(), end = configDefines.end();
+ it != end; ++it)
{
- _rcc_files += sepRccFiles;
- _rcc_files += absFile;
- sepRccFiles = ";";
-
- std::string basename = cmsys::SystemTools::
- GetFilenameWithoutLastExtension(absFile);
-
- std::string rcc_output_file = makefile->GetCurrentOutputDirectory();
- rcc_output_file += "/qrc_" + basename + ".cpp";
- makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
- rcc_output_file.c_str(), false);
- cmSourceFile* rccCppSource
- = makefile->GetOrCreateSource(rcc_output_file.c_str(), true);
- newFiles.push_back(rccCppSource);
-
- if (const char *prop = sf->GetProperty("AUTORCC_OPTIONS"))
- {
- rccFileFiles += sep;
- rccFileFiles += absFile;
- rccFileOptions += sep;
- std::string opts = prop;
- cmSystemTools::ReplaceString(opts, ";", "@list_sep@");
- rccFileOptions += opts;
- sep = ";";
- }
+ infoFile << "set(AM_MOC_COMPILE_DEFINITIONS_" << it->first <<
+ " " << it->second << ")\n";
}
}
- }
-
- for(std::vector<cmSourceFile*>::const_iterator fileIt = newFiles.begin();
- fileIt != newFiles.end();
- ++fileIt)
- {
- target->AddSourceFile(*fileIt);
- }
-
- makefile->AddDefinition("_rcc_files",
- cmLocalGenerator::EscapeForCMake(_rcc_files.c_str()).c_str());
-
- makefile->AddDefinition("_qt_rcc_options_files",
- cmLocalGenerator::EscapeForCMake(rccFileFiles.c_str()).c_str());
- makefile->AddDefinition("_qt_rcc_options_options",
- cmLocalGenerator::EscapeForCMake(rccFileOptions.c_str()).c_str());
-
- const char *qtRcc = makefile->GetSafeDefinition("QT_RCC_EXECUTABLE");
- makefile->AddDefinition("_qt_rcc_executable", qtRcc);
-
- const char* targetName = target->GetName();
- const char *qtVersion = makefile->GetDefinition("_target_qt_version");
- if (strcmp(qtVersion, "5") == 0)
- {
- cmTarget *qt5Rcc = makefile->FindTargetToUse("Qt5::rcc");
- if (!qt5Rcc)
- {
- cmSystemTools::Error("Qt5::rcc target not found ",
- targetName);
- return;
- }
- makefile->AddDefinition("_qt_rcc_executable", qt5Rcc->GetLocation(0));
- }
- else
- {
- if (strcmp(qtVersion, "4") != 0)
+ if (!configIncludes.empty())
{
- cmSystemTools::Error("The CMAKE_AUTORCC feature supports only Qt 4 and "
- "Qt 5 ", targetName);
+ for (std::map<std::string, std::string>::iterator
+ it = configIncludes.begin(), end = configIncludes.end();
+ it != end; ++it)
+ {
+ infoFile << "set(AM_MOC_INCLUDES_" << it->first <<
+ " " << it->second << ")\n";
+ }
}
}
}
-bool cmQtAutoGenerators::Run(const char* targetDirectory, const char *config)
+
+bool cmQtAutomoc::Run(const char* targetDirectory, const char *config)
{
bool success = true;
cmake cm;
cmGlobalGenerator* gg = this->CreateGlobalGenerator(&cm, targetDirectory);
cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile();
- this->ReadAutogenInfoFile(makefile, targetDirectory, config);
+ this->ReadAutomocInfoFile(makefile, targetDirectory, config);
this->ReadOldMocDefinitionsFile(makefile, targetDirectory);
this->Init();
if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
{
- success = this->RunAutogen(makefile);
+ success = this->RunAutomoc(makefile);
}
this->WriteOldMocDefinitionsFile(targetDirectory);
@@ -741,7 +492,7 @@ bool cmQtAutoGenerators::Run(const char* targetDirectory, const char *config)
}
-cmGlobalGenerator* cmQtAutoGenerators::CreateGlobalGenerator(cmake* cm,
+cmGlobalGenerator* cmQtAutomoc::CreateGlobalGenerator(cmake* cm,
const char* targetDirectory)
{
cmGlobalGenerator* gg = new cmGlobalGenerator();
@@ -758,13 +509,13 @@ cmGlobalGenerator* cmQtAutoGenerators::CreateGlobalGenerator(cmake* cm,
}
-bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
+bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
const char* targetDirectory,
const char *config)
{
std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
cmSystemTools::ConvertToUnixSlashes(filename);
- filename += "/AutogenInfo.cmake";
+ filename += "/AutomocInfo.cmake";
if (!makefile->ReadListFile(0, filename.c_str()))
{
@@ -779,17 +530,12 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
"AM_Qt5Core_VERSION_MAJOR");
}
this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
- this->RccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES");
- this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC");
- this->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC");
this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
this->IncludeProjectDirsBefore = makefile->IsOn(
"AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE");
this->Srcdir = makefile->GetSafeDefinition("AM_CMAKE_CURRENT_SOURCE_DIR");
this->Builddir = makefile->GetSafeDefinition("AM_CMAKE_CURRENT_BINARY_DIR");
this->MocExecutable = makefile->GetSafeDefinition("AM_QT_MOC_EXECUTABLE");
- this->UicExecutable = makefile->GetSafeDefinition("AM_QT_UIC_EXECUTABLE");
- this->RccExecutable = makefile->GetSafeDefinition("AM_QT_RCC_EXECUTABLE");
std::string compileDefsPropOrig = "AM_MOC_COMPILE_DEFINITIONS";
std::string compileDefsProp = compileDefsPropOrig;
if(config)
@@ -815,50 +561,6 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
this->ProjectSourceDir = makefile->GetSafeDefinition("AM_CMAKE_SOURCE_DIR");
this->TargetName = makefile->GetSafeDefinition("AM_TARGET_NAME");
- {
- const char *uicOptionsFiles
- = makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES");
- const char *uicOptionsOptions
- = makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS");
- std::vector<std::string> uicFilesVec;
- cmSystemTools::ExpandListArgument(uicOptionsFiles, uicFilesVec);
- std::vector<std::string> uicOptionsVec;
- cmSystemTools::ExpandListArgument(uicOptionsOptions, uicOptionsVec);
- if (uicFilesVec.size() != uicOptionsVec.size())
- {
- return false;
- }
- for (std::vector<std::string>::iterator fileIt = uicFilesVec.begin(),
- optionIt = uicOptionsVec.begin();
- fileIt != uicFilesVec.end();
- ++fileIt, ++optionIt)
- {
- cmSystemTools::ReplaceString(*optionIt, "@list_sep@", ";");
- this->UicOptions[*fileIt] = *optionIt;
- }
- }
- {
- const char *rccOptionsFiles
- = makefile->GetSafeDefinition("AM_RCC_OPTIONS_FILES");
- const char *rccOptionsOptions
- = makefile->GetSafeDefinition("AM_RCC_OPTIONS_OPTIONS");
- std::vector<std::string> rccFilesVec;
- cmSystemTools::ExpandListArgument(rccOptionsFiles, rccFilesVec);
- std::vector<std::string> rccOptionsVec;
- cmSystemTools::ExpandListArgument(rccOptionsOptions, rccOptionsVec);
- if (rccFilesVec.size() != rccOptionsVec.size())
- {
- return false;
- }
- for (std::vector<std::string>::iterator fileIt = rccFilesVec.begin(),
- optionIt = rccOptionsVec.begin();
- fileIt != rccFilesVec.end();
- ++fileIt, ++optionIt)
- {
- cmSystemTools::ReplaceString(*optionIt, "@list_sep@", ";");
- this->RccOptions[*fileIt] = *optionIt;
- }
- }
this->CurrentCompileSettingsStr = this->MakeCompileSettingsString(makefile);
this->RelaxedMode = makefile->IsOn("AM_RELAXED_MODE");
@@ -867,7 +569,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
}
-std::string cmQtAutoGenerators::MakeCompileSettingsString(cmMakefile* makefile)
+std::string cmQtAutomoc::MakeCompileSettingsString(cmMakefile* makefile)
{
std::string s;
s += makefile->GetSafeDefinition("AM_MOC_COMPILE_DEFINITIONS");
@@ -884,7 +586,7 @@ std::string cmQtAutoGenerators::MakeCompileSettingsString(cmMakefile* makefile)
}
-bool cmQtAutoGenerators::ReadOldMocDefinitionsFile(cmMakefile* makefile,
+bool cmQtAutomoc::ReadOldMocDefinitionsFile(cmMakefile* makefile,
const char* targetDirectory)
{
std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
@@ -900,8 +602,7 @@ bool cmQtAutoGenerators::ReadOldMocDefinitionsFile(cmMakefile* makefile,
}
-void
-cmQtAutoGenerators::WriteOldMocDefinitionsFile(const char* targetDirectory)
+void cmQtAutomoc::WriteOldMocDefinitionsFile(const char* targetDirectory)
{
std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
cmSystemTools::ConvertToUnixSlashes(filename);
@@ -918,7 +619,7 @@ cmQtAutoGenerators::WriteOldMocDefinitionsFile(const char* targetDirectory)
}
-void cmQtAutoGenerators::Init()
+void cmQtAutomoc::Init()
{
this->OutMocCppFilename = this->Builddir;
this->OutMocCppFilename += this->TargetName;
@@ -1005,7 +706,7 @@ void cmQtAutoGenerators::Init()
}
-bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
+bool cmQtAutomoc::RunAutomoc(cmMakefile* makefile)
{
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
|| (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
@@ -1032,56 +733,26 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
const std::vector<std::string>& headerExtensions =
makefile->GetHeaderExtensions();
- std::vector<std::string> includedUis;
- std::vector<std::string> skippedUis;
- std::vector<std::string> uicSkipped;
- cmSystemTools::ExpandListArgument(this->SkipUic, uicSkipped);
-
for (std::vector<std::string>::const_iterator it = sourceFiles.begin();
it != sourceFiles.end();
++it)
{
- const bool skipUic = std::find(uicSkipped.begin(), uicSkipped.end(), *it)
- != uicSkipped.end();
- std::vector<std::string>& uiFiles = skipUic ? skippedUis : includedUis;
const std::string &absFilename = *it;
if (this->Verbose)
{
- std::cout << "AUTOGEN: Checking " << absFilename << std::endl;
+ std::cout << "AUTOMOC: Checking " << absFilename << std::endl;
}
if (this->RelaxedMode)
{
- this->ParseCppFile(absFilename, headerExtensions, includedMocs,
- uiFiles);
+ this->ParseCppFile(absFilename, headerExtensions, includedMocs);
}
else
{
- this->StrictParseCppFile(absFilename, headerExtensions, includedMocs,
- uiFiles);
+ this->StrictParseCppFile(absFilename, headerExtensions, includedMocs);
}
this->SearchHeadersForCppFile(absFilename, headerExtensions, headerFiles);
}
- {
- std::vector<std::string> mocSkipped;
- cmSystemTools::ExpandListArgument(this->SkipMoc, mocSkipped);
- for (std::vector<std::string>::const_iterator it = mocSkipped.begin();
- it != mocSkipped.end();
- ++it)
- {
- if (std::find(uicSkipped.begin(), uicSkipped.end(), *it)
- != uicSkipped.end())
- {
- const std::string &absFilename = *it;
- if (this->Verbose)
- {
- std::cout << "AUTOGEN: Checking " << absFilename << std::endl;
- }
- this->ParseForUic(absFilename, includedUis);
- }
- }
- }
-
std::vector<std::string> headerFilesVec;
cmSystemTools::ExpandListArgument(this->Headers, headerFilesVec);
for (std::vector<std::string>::const_iterator it = headerFilesVec.begin();
@@ -1093,7 +764,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
// key = moc source filepath, value = moc output filename
std::map<std::string, std::string> notIncludedMocs;
- this->ParseHeaders(headerFiles, includedMocs, notIncludedMocs, includedUis);
+ this->ParseHeaders(headerFiles, includedMocs, notIncludedMocs);
// run moc on all the moc's that are #included in source files
for(std::map<std::string, std::string>::const_iterator
@@ -1103,17 +774,6 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{
this->GenerateMoc(it->first, it->second);
}
- for(std::vector<std::string>::const_iterator it = includedUis.begin();
- it != includedUis.end();
- ++it)
- {
- this->GenerateUi(*it);
- }
-
- if(!this->RccExecutable.empty())
- {
- this->GenerateQrc();
- }
cmsys_ios::stringstream outStream;
outStream << "/* This file is autogenerated, do not edit*/\n";
@@ -1146,17 +806,6 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
std::cerr << "moc failed..."<< std::endl;
return false;
}
-
- if (this->RunUicFailed)
- {
- std::cerr << "uic failed..."<< std::endl;
- return false;
- }
- if (this->RunRccFailed)
- {
- std::cerr << "rcc failed..."<< std::endl;
- return false;
- }
outStream.flush();
std::string automocSource = outStream.str();
if (!automocCppChanged)
@@ -1181,10 +830,9 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
}
-void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
+void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
- std::map<std::string, std::string>& includedMocs,
- std::vector<std::string> &includedUis)
+ std::map<std::string, std::string>& includedMocs)
{
cmsys::RegularExpression mocIncludeRegExp(
"[\n][ \t]*#[ \t]*include[ \t]+"
@@ -1193,7 +841,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty())
{
- std::cerr << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
+ std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty\n"
<< std::endl;
return;
}
@@ -1253,7 +901,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr << "AUTOGEN: error: " << absFilename << " The file "
+ std::cerr << "AUTOMOC: error: " << absFilename << " The file "
<< "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" ";
@@ -1284,7 +932,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
fileToMoc = headerToMoc;
if ((requiresMoc==false) &&(basename==scannedFileBasename))
{
- std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
+ std::cerr << "AUTOMOC: warning: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc <<
"\", but does not contain a " << macroName
<< " macro. Running moc on "
@@ -1295,7 +943,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
+ std::cerr << "AUTOMOC: warning: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc <<
"\" instead of \"moc_" << basename << ".cpp\". "
"Running moc on "
@@ -1307,7 +955,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr <<"AUTOGEN: error: " << absFilename << ": The file "
+ std::cerr <<"AUTOMOC: error: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc <<
"\", which seems to be the moc file from a different "
"source file. CMake also could not find a matching "
@@ -1325,7 +973,6 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
matchOffset += mocIncludeRegExp.end();
} while(mocIncludeRegExp.find(contentsString.c_str() + matchOffset));
}
- this->ParseForUic(absFilename, contentsString, includedUis);
// In this case, check whether the scanned file itself contains a Q_OBJECT.
// If this is the case, the moc_foo.cpp should probably be generated from
@@ -1336,7 +983,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
if (mocUnderscoreIncluded == true)
{
// this is for KDE4 compatibility:
- std::cerr << "AUTOGEN: warning: " << absFilename << ": The file "
+ std::cerr << "AUTOMOC: warning: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not "
"include "
<< "\"" << scannedFileBasename << ".moc\", but instead "
@@ -1352,7 +999,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
else
{
// otherwise always error out since it will not compile:
- std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
+ std::cerr << "AUTOMOC: error: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not "
"include "
<< "\"" << scannedFileBasename << ".moc\" !\n"
@@ -1364,10 +1011,9 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
-void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
+void cmQtAutomoc::StrictParseCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
- std::map<std::string, std::string>& includedMocs,
- std::vector<std::string>& includedUis)
+ std::map<std::string, std::string>& includedMocs)
{
cmsys::RegularExpression mocIncludeRegExp(
"[\n][ \t]*#[ \t]*include[ \t]+"
@@ -1376,7 +1022,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty())
{
- std::cerr << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
+ std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty\n"
<< std::endl;
return;
}
@@ -1423,7 +1069,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr << "AUTOGEN: error: " << absFilename << " The file "
+ std::cerr << "AUTOMOC: error: " << absFilename << " The file "
<< "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" ";
@@ -1444,7 +1090,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
{
if (basename != scannedFileBasename)
{
- std::cerr <<"AUTOGEN: error: " << absFilename << ": The file "
+ std::cerr <<"AUTOMOC: error: " << absFilename << ": The file "
"includes the moc file \"" << currentMoc <<
"\", which seems to be the moc file from a different "
"source file. This is not supported. "
@@ -1458,7 +1104,6 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
matchOffset += mocIncludeRegExp.end();
} while(mocIncludeRegExp.find(contentsString.c_str() + matchOffset));
}
- this->ParseForUic(absFilename, contentsString, includedUis);
// In this case, check whether the scanned file itself contains a Q_OBJECT.
// If this is the case, the moc_foo.cpp should probably be generated from
@@ -1469,7 +1114,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
macroName)))
{
// otherwise always error out since it will not compile:
- std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
+ std::cerr << "AUTOMOC: error: " << absFilename << ": The file "
<< "contains a " << macroName << " macro, but does not include "
<< "\"" << scannedFileBasename << ".moc\" !\n"
<< std::endl;
@@ -1479,63 +1124,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
}
-void cmQtAutoGenerators::ParseForUic(const std::string& absFilename,
- std::vector<std::string>& includedUis)
-{
- if (this->UicExecutable.empty())
- {
- return;
- }
- const std::string contentsString = this->ReadAll(absFilename);
- if (contentsString.empty())
- {
- std::cerr << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
- << std::endl;
- return;
- }
- this->ParseForUic(absFilename, contentsString, includedUis);
-}
-
-
-void cmQtAutoGenerators::ParseForUic(const std::string&,
- const std::string& contentsString,
- std::vector<std::string>& includedUis)
-{
- if (this->UicExecutable.empty())
- {
- return;
- }
- cmsys::RegularExpression uiIncludeRegExp(
- "[\n][ \t]*#[ \t]*include[ \t]+"
- "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
-
- std::string::size_type matchOffset = 0;
-
- matchOffset = 0;
- if ((strstr(contentsString.c_str(), "ui_") != NULL)
- && (uiIncludeRegExp.find(contentsString)))
- {
- do
- {
- const std::string currentUi = uiIncludeRegExp.match(1);
-
- std::string basename = cmsys::SystemTools::
- GetFilenameWithoutLastExtension(currentUi);
-
- // basename should be the part of the ui filename used for
- // finding the correct header, so we need to remove the ui_ part
- basename = basename.substr(3);
-
- includedUis.push_back(basename);
-
- matchOffset += uiIncludeRegExp.end();
- } while(uiIncludeRegExp.find(contentsString.c_str() + matchOffset));
- }
-}
-
-
-void
-cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
+void cmQtAutomoc::SearchHeadersForCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
std::set<std::string>& absHeaders)
{
@@ -1571,29 +1160,28 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
}
-void cmQtAutoGenerators::ParseHeaders(const std::set<std::string>& absHeaders,
+void cmQtAutomoc::ParseHeaders(const std::set<std::string>& absHeaders,
const std::map<std::string, std::string>& includedMocs,
- std::map<std::string, std::string>& notIncludedMocs,
- std::vector<std::string>& includedUis)
+ std::map<std::string, std::string>& notIncludedMocs)
{
for(std::set<std::string>::const_iterator hIt=absHeaders.begin();
hIt!=absHeaders.end();
++hIt)
{
const std::string& headerName = *hIt;
- const std::string contents = this->ReadAll(headerName);
if (includedMocs.find(headerName) == includedMocs.end())
{
if (this->Verbose)
{
- std::cout << "AUTOGEN: Checking " << headerName << std::endl;
+ std::cout << "AUTOMOC: Checking " << headerName << std::endl;
}
const std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(headerName);
const std::string currentMoc = "moc_" + basename + ".cpp";
+ const std::string contents = this->ReadAll(headerName);
std::string macroName;
if (requiresMocing(contents, macroName))
{
@@ -1601,11 +1189,12 @@ void cmQtAutoGenerators::ParseHeaders(const std::set<std::string>& absHeaders,
notIncludedMocs[headerName] = currentMoc;
}
}
- this->ParseForUic(headerName, contents, includedUis);
}
+
}
-bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
+
+bool cmQtAutomoc::GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName)
{
const std::string mocFilePath = this->Builddir + mocFileName;
@@ -1671,7 +1260,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
if (!result || retVal)
{
- std::cerr << "AUTOGEN: error: process for " << mocFilePath <<" failed:\n"
+ std::cerr << "AUTOMOC: error: process for " << mocFilePath <<" failed:\n"
<< output << std::endl;
this->RunMocFailed = true;
cmSystemTools::RemoveFile(mocFilePath.c_str());
@@ -1681,133 +1270,8 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
return false;
}
-bool cmQtAutoGenerators::GenerateUi(const std::string& uiFileName)
-{
- if (!cmsys::SystemTools::FileExists(this->Builddir.c_str(), false))
- {
- cmsys::SystemTools::MakeDirectory(this->Builddir.c_str());
- }
-
- std::string ui_output_file = "ui_" + uiFileName + ".h";
- std::string ui_input_file = uiFileName + ".ui";
-
- std::string msg = "Generating ";
- msg += ui_output_file;
- cmSystemTools::MakefileColorEcho(cmsysTerminal_Color_ForegroundBlue
- |cmsysTerminal_Color_ForegroundBold,
- msg.c_str(), true, this->ColorOutput);
-
- std::vector<cmStdString> command;
- command.push_back(this->UicExecutable);
-
- std::string options;
- std::map<std::string, std::string>::const_iterator optionIt
- = this->UicOptions.find(this->ProjectSourceDir + ui_input_file);
- if (optionIt != this->UicOptions.end())
- {
- std::vector<std::string> opts;
- cmSystemTools::ExpandListArgument(optionIt->second, opts);
- for(std::vector<std::string>::const_iterator optIt = opts.begin();
- optIt != opts.end();
- ++optIt)
- {
- command.push_back(*optIt);
- }
- }
-
- command.push_back("-o");
- command.push_back(ui_output_file);
- command.push_back(this->ProjectSourceDir + ui_input_file);
-
- if (this->Verbose)
- {
- for(std::vector<cmStdString>::const_iterator cmdIt = command.begin();
- cmdIt != command.end();
- ++cmdIt)
- {
- std::cout << *cmdIt << " ";
- }
- std::cout << std::endl;
- }
- std::string output;
- int retVal = 0;
- bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
- if (!result || retVal)
- {
- std::cerr << "AUTOUIC: error: process for " << ui_output_file <<
- " failed:\n" << output << std::endl;
- this->RunUicFailed = true;
- cmSystemTools::RemoveFile(ui_output_file.c_str());
- }
- return true;
-}
-
-bool cmQtAutoGenerators::GenerateQrc()
-{
- std::vector<std::string> sourceFiles;
- cmSystemTools::ExpandListArgument(this->RccSources, sourceFiles);
-
- for(std::vector<std::string>::const_iterator si = sourceFiles.begin();
- si != sourceFiles.end(); ++si)
- {
- std::string ext = cmsys::SystemTools::GetFilenameLastExtension(*si);
-
- if (ext != ".qrc")
- {
- continue;
- }
- std::vector<cmStdString> command;
- command.push_back(this->RccExecutable);
-
- std::string basename = cmsys::SystemTools::
- GetFilenameWithoutLastExtension(*si);
-
- std::string rcc_output_file = "qrc_" + basename + ".cpp";
-
- std::string options;
- std::map<std::string, std::string>::const_iterator optionIt
- = this->RccOptions.find(*si);
- if (optionIt != this->RccOptions.end())
- {
- std::vector<std::string> opts;
- cmSystemTools::ExpandListArgument(optionIt->second, opts);
- for(std::vector<std::string>::const_iterator optIt = opts.begin();
- optIt != opts.end();
- ++optIt)
- {
- command.push_back(*optIt);
- }
- }
-
- command.push_back("-o");
- command.push_back(rcc_output_file);
- command.push_back(*si);
-
- if (this->Verbose)
- {
- for(std::vector<cmStdString>::const_iterator cmdIt = command.begin();
- cmdIt != command.end();
- ++cmdIt)
- {
- std::cout << *cmdIt << " ";
- }
- std::cout << std::endl;
- }
- std::string output;
- int retVal = 0;
- bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
- if (!result || retVal)
- {
- std::cerr << "AUTORCC: error: process for " << rcc_output_file <<
- " failed:\n" << output << std::endl;
- this->RunRccFailed = true;
- cmSystemTools::RemoveFile(rcc_output_file.c_str());
- }
- }
- return true;
-}
-std::string cmQtAutoGenerators::Join(const std::vector<std::string>& lst,
+std::string cmQtAutomoc::Join(const std::vector<std::string>& lst,
char separator)
{
if (lst.empty())
@@ -1827,15 +1291,13 @@ std::string cmQtAutoGenerators::Join(const std::vector<std::string>& lst,
}
-bool cmQtAutoGenerators::StartsWith(const std::string& str,
- const std::string& with)
+bool cmQtAutomoc::StartsWith(const std::string& str, const std::string& with)
{
return (str.substr(0, with.length()) == with);
}
-bool cmQtAutoGenerators::EndsWith(const std::string& str,
- const std::string& with)
+bool cmQtAutomoc::EndsWith(const std::string& str, const std::string& with)
{
if (with.length() > (str.length()))
{
@@ -1845,7 +1307,7 @@ bool cmQtAutoGenerators::EndsWith(const std::string& str,
}
-std::string cmQtAutoGenerators::ReadAll(const std::string& filename)
+std::string cmQtAutomoc::ReadAll(const std::string& filename)
{
std::ifstream file(filename.c_str());
cmsys_ios::stringstream stream;
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutomoc.h
similarity index 68%
rename from Source/cmQtAutoGenerators.h
rename to Source/cmQtAutomoc.h
index 15cfe0d..ebeeb0e 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutomoc.h
@@ -11,33 +11,26 @@
See the License for more information.
============================================================================*/
-#ifndef cmQtAutoGenerators_h
-#define cmQtAutoGenerators_h
+#ifndef cmQtAutomoc_h
+#define cmQtAutomoc_h
class cmGlobalGenerator;
class cmMakefile;
-class cmQtAutoGenerators
+class cmQtAutomoc
{
public:
- cmQtAutoGenerators();
+ cmQtAutomoc();
bool Run(const char* targetDirectory, const char *config);
bool InitializeMocSourceFile(cmTarget* target);
- void SetupAutoGenerateTarget(cmTarget* target);
+ void SetupAutomocTarget(cmTarget* target);
private:
- void SetupAutoMocTarget(cmTarget* target,
- const std::string &autogenTargetName,
- std::map<std::string, std::string> &configIncludes,
- std::map<std::string, std::string> &configDefines);
- void SetupAutoUicTarget(cmTarget* target);
- void SetupAutoRccTarget(cmTarget* target);
-
cmGlobalGenerator* CreateGlobalGenerator(cmake* cm,
const char* targetDirectory);
- bool ReadAutogenInfoFile(cmMakefile* makefile,
+ bool ReadAutomocInfoFile(cmMakefile* makefile,
const char* targetDirectory,
const char *config);
bool ReadOldMocDefinitionsFile(cmMakefile* makefile,
@@ -46,34 +39,22 @@ private:
std::string MakeCompileSettingsString(cmMakefile* makefile);
- bool RunAutogen(cmMakefile* makefile);
+ bool RunAutomoc(cmMakefile* makefile);
bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName);
- bool GenerateUi(const std::string& uiFileName);
- bool GenerateQrc();
void ParseCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
- std::map<std::string, std::string>& includedMocs,
- std::vector<std::string>& includedUis);
+ std::map<std::string, std::string>& includedMocs);
void StrictParseCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
- std::map<std::string, std::string>& includedMocs,
- std::vector<std::string>& includedUis);
+ std::map<std::string, std::string>& includedMocs);
void SearchHeadersForCppFile(const std::string& absFilename,
const std::vector<std::string>& headerExtensions,
std::set<std::string>& absHeaders);
void ParseHeaders(const std::set<std::string>& absHeaders,
const std::map<std::string, std::string>& includedMocs,
- std::map<std::string, std::string>& notIncludedMocs,
- std::vector<std::string>& includedUis);
-
- void ParseForUic(const std::string& fileName,
- const std::string& contentsString,
- std::vector<std::string>& includedUis);
-
- void ParseForUic(const std::string& fileName,
- std::vector<std::string>& includedUis);
+ std::map<std::string, std::string>& notIncludedMocs);
void Init();
@@ -84,16 +65,11 @@ private:
std::string QtMajorVersion;
std::string Sources;
- std::string RccSources;
- std::string SkipMoc;
- std::string SkipUic;
std::string Headers;
bool IncludeProjectDirsBefore;
std::string Srcdir;
std::string Builddir;
std::string MocExecutable;
- std::string UicExecutable;
- std::string RccExecutable;
std::string MocCompileDefinitionsStr;
std::string MocIncludesStr;
std::string MocOptionsStr;
@@ -108,14 +84,10 @@ private:
std::list<std::string> MocIncludes;
std::list<std::string> MocDefinitions;
std::vector<std::string> MocOptions;
- std::map<std::string, std::string> UicOptions;
- std::map<std::string, std::string> RccOptions;
bool Verbose;
bool ColorOutput;
bool RunMocFailed;
- bool RunUicFailed;
- bool RunRccFailed;
bool GenerateAll;
bool RelaxedMode;
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 1a103c2..8bb7d96 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -288,17 +288,6 @@ void cmSourceFile::SetProperty(const char* prop, const char* value)
}
this->Properties.SetProperty(prop, value, cmProperty::SOURCE_FILE);
-
- std::string ext =
- cmSystemTools::GetFilenameLastExtension(this->Location.GetName());
- if (ext == ".ui")
- {
- cmMakefile* mf = this->Location.GetMakefile();
- if (strcmp(prop, "AUTOUIC_OPTIONS") == 0)
- {
- mf->AddQtUiFileWithOptions(this);
- }
- }
}
//----------------------------------------------------------------------------
@@ -407,26 +396,6 @@ void cmSourceFile::DefineProperties(cmake *cm)
"only used by some tools that wrap classes into other languages.");
cm->DefineProperty
- ("AUTOUIC_OPTIONS", cmProperty::SOURCE_FILE,
- "Additional options for uic when using autouic (see the AUTOUIC target "
- "property)",
- "This property holds additional command line options "
- "which will be used when uic is executed during the build via autouic, "
- "i.e. it is equivalent to the optional OPTIONS argument of the "
- "qt4_wrap_ui() macro.\n"
- "By default it is empty.");
-
- cm->DefineProperty
- ("AUTORCC_OPTIONS", cmProperty::SOURCE_FILE,
- "Additional options for rcc when using autorcc (see the AUTORCC target "
- "property)",
- "This property holds additional command line options "
- "which will be used when rcc is executed during the build via autorcc, "
- "i.e. it is equivalent to the optional OPTIONS argument of the "
- "qt4_add_resources() macro.\n"
- "By default it is empty.");
-
- cm->DefineProperty
("COMPILE_FLAGS", cmProperty::SOURCE_FILE,
"Additional flags to be added when compiling this source file.",
"These flags will be added to the list of compile flags when "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3812421..1c04e4e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -245,45 +245,10 @@ void cmTarget::DefineProperties(cmake *cm)
"By setting the CMAKE_AUTOMOC_RELAXED_MODE variable to TRUE the rules "
"for searching the files which will be processed by moc can be relaxed. "
"See the documentation for this variable for more details.\n"
- "The global property AUTOGEN_TARGETS_FOLDER can be used to group the "
+ "The global property AUTOMOC_TARGETS_FOLDER can be used to group the "
"automoc targets together in an IDE, e.g. in MSVS.");
cm->DefineProperty
- ("AUTOUIC", cmProperty::TARGET,
- "Should the target be processed with autouic (for Qt projects).",
- "AUTOUIC is a boolean specifying whether CMake will handle "
- "the Qt uic code generator automatically, i.e. without having to use "
- "the QT4_WRAP_UI() or QT5_WRAP_UI() macro. Currently Qt4 and Qt5 are "
- "supported. "
- "When this property is set to TRUE, CMake will scan the source files "
- "at build time and invoke uic accordingly. "
- "If an #include statement like #include \"ui_foo.h\" is found in "
- "foo.cpp, a foo.ui file is expected next to foo.cpp, and uic is "
- "run on the foo.ui file. "
- "This property is initialized by the value of the variable "
- "CMAKE_AUTOUIC if it is set when a target is created.\n"
- "Additional command line options for uic can be set via the "
- "UIC_OPTIONS source file property on the foo.ui file.\n"
- "The global property AUTOGEN_TARGETS_FOLDER can be used to group the"
- "autouic targets together in an IDE, e.g. in MSVS.");
-
- cm->DefineProperty
- ("AUTORCC", cmProperty::TARGET,
- "Should the target be processed with autorcc (for Qt projects).",
- "AUTORCC is a boolean specifying whether CMake will handle "
- "the Qt rcc code generator automatically, i.e. without having to use "
- "the QT4_ADD_RESOURCES() or QT5_ADD_RESOURCES() macro. Currently Qt4 "
- "and Qt5 are supported. "
- "When this property is set to TRUE, CMake will handle .qrc files added "
- "as target sources at build time and invoke rcc accordingly. "
- "This property is initialized by the value of the variable "
- "CMAKE_AUTORCC if it is set when a target is created.\n"
- "Additional command line options for rcc can be set via the "
- "RCC_OPTIONS source file property on the .qrc file.\n"
- "The global property AUTOGEN_TARGETS_FOLDER can be used to group the"
- "autorcc targets together in an IDE, e.g. in MSVS.");
-
- cm->DefineProperty
("AUTOMOC_MOC_OPTIONS", cmProperty::TARGET,
"Additional options for moc when using automoc (see the AUTOMOC property)",
"This property is only used if the AUTOMOC property is set to TRUE for "
@@ -1682,8 +1647,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
this->SetPropertyDefault("GNUtoMS", 0);
this->SetPropertyDefault("OSX_ARCHITECTURES", 0);
this->SetPropertyDefault("AUTOMOC", 0);
- this->SetPropertyDefault("AUTOUIC", 0);
- this->SetPropertyDefault("AUTORCC", 0);
this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", 0);
this->SetPropertyDefault("LINK_DEPENDS_NO_SHARED", 0);
this->SetPropertyDefault("LINK_INTERFACE_LIBRARIES", 0);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index de5459c..d2961c0 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2605,16 +2605,6 @@ void cmake::DefineProperties(cmake *cm)
("AUTOMOC_TARGETS_FOLDER", cmProperty::GLOBAL,
"Name of FOLDER for *_automoc targets that are added automatically by "
"CMake for targets for which AUTOMOC is enabled.",
- "This property is obsolete. Use AUTOGEN_TARGETS_FOLDER instead."
- "\n"
- "If not set, CMake uses the FOLDER property of the parent target as a "
- "default value for this property. See also the documentation for the "
- "FOLDER target property and the AUTOMOC target property.");
-
- cm->DefineProperty
- ("AUTOGEN_TARGETS_FOLDER", cmProperty::GLOBAL,
- "Name of FOLDER for *_autogen targets that are added automatically by "
- "CMake for targets for which AUTOMOC is enabled.",
"If not set, CMake uses the FOLDER property of the parent target as a "
"default value for this property. See also the documentation for the "
"FOLDER target property and the AUTOMOC target property.");
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index d8567bb..48d7d7b 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -13,7 +13,7 @@
#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
-#include "cmQtAutoGenerators.h"
+#include "cmQtAutomoc.h"
#include "cmVersion.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -637,12 +637,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
{
return cmcmd::ExecuteEchoColor(args);
}
- else if (args[1] == "cmake_autogen")
+ else if (args[1] == "cmake_automoc")
{
- cmQtAutoGenerators autogen;
+ cmQtAutomoc automoc;
const char *config = args[3].empty() ? 0 : args[3].c_str();
- bool autogenSuccess = autogen.Run(args[2].c_str(), config);
- return autogenSuccess ? 0 : 1;
+ bool automocSuccess = automoc.Run(args[2].c_str(), config);
+ return automocSuccess ? 0 : 1;
}
#endif
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0e9bf83..f7b98da 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1015,43 +1015,34 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt")
- # On Windows there is no RPATH, so while Qt might be available for building,
- # the required dlls may not be in the PATH, so we can't run the executables
- # on that platform.
- if(WIN32)
- set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V)
- else()
- set(run_autogen_test QtAutogen)
- endif()
-
find_package(Qt5Widgets QUIET NO_MODULE)
if(Qt5Widgets_FOUND)
- add_test(Qt5Autogen ${CMAKE_CTEST_COMMAND}
+ add_test(Qt5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/QtAutogen"
- "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
+ "${CMake_SOURCE_DIR}/Tests/QtAutomoc"
+ "${CMake_BINARY_DIR}/Tests/Qt5Automoc"
${build_generator_args}
- --build-project QtAutogen
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
+ --build-project QtAutomoc
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Automoc"
--force-new-ctest-process
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5
- --test-command ${run_autogen_test}
+ --test-command ${CMAKE_CTEST_COMMAND} -V
)
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen")
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Automoc")
endif()
if(QT4_WORKS AND QT_QTGUI_FOUND)
- add_test(Qt4Autogen ${CMAKE_CTEST_COMMAND}
+ add_test(Qt4Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/QtAutogen"
- "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
+ "${CMake_SOURCE_DIR}/Tests/QtAutomoc"
+ "${CMake_BINARY_DIR}/Tests/Qt4Automoc"
${build_generator_args}
- --build-project QtAutogen
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
+ --build-project QtAutomoc
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Automoc"
--force-new-ctest-process
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4
- --test-command ${run_autogen_test}
+ --test-command ${CMAKE_CTEST_COMMAND} -V
)
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen")
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Automoc")
add_test(Qt4Targets ${CMAKE_CTEST_COMMAND}
--build-and-test
diff --git a/Tests/QtAutogen/calwidget.ui b/Tests/QtAutogen/calwidget.ui
deleted file mode 100644
index 1c245ca..0000000
--- a/Tests/QtAutogen/calwidget.ui
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Window</class>
- <widget class="QWidget" name="Window">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <widget class="QPushButton" name="pushButton">
- <property name="geometry">
- <rect>
- <x>90</x>
- <y>180</y>
- <width>94</width>
- <height>24</height>
- </rect>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp
deleted file mode 100644
index 43314e1..0000000
--- a/Tests/QtAutogen/resourcetester.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#include "resourcetester.h"
-
-#include <QDebug>
-#include <QApplication>
-#include <QFile>
-#include <QTimer>
-
-ResourceTester::ResourceTester(QObject *parent)
- : QObject(parent)
-{
-
-}
-
-void ResourceTester::doTest()
-{
- if (!QFile::exists(":/CMakeLists.txt"))
- qApp->exit(EXIT_FAILURE);
-
- QTimer::singleShot(0, qApp, SLOT(quit()));
-}
diff --git a/Tests/QtAutogen/resourcetester.h b/Tests/QtAutogen/resourcetester.h
deleted file mode 100644
index b02cb4e..0000000
--- a/Tests/QtAutogen/resourcetester.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef RESOURCE_TESTER_H
-#define RESOURCE_TESTER_H
-
-#include <QObject>
-
-class ResourceTester : public QObject
-{
- Q_OBJECT
-public:
- explicit ResourceTester(QObject *parent = 0);
-
-private slots:
- void doTest();
-};
-
-#endif
diff --git a/Tests/QtAutogen/test.qrc b/Tests/QtAutogen/test.qrc
deleted file mode 100644
index c3d4e3c..0000000
--- a/Tests/QtAutogen/test.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
- <file>CMakeLists.txt</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/Adir/CMakeLists.txt b/Tests/QtAutomoc/Adir/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/Adir/CMakeLists.txt
rename to Tests/QtAutomoc/Adir/CMakeLists.txt
diff --git a/Tests/QtAutogen/Adir/libA.cpp b/Tests/QtAutomoc/Adir/libA.cpp
similarity index 100%
rename from Tests/QtAutogen/Adir/libA.cpp
rename to Tests/QtAutomoc/Adir/libA.cpp
diff --git a/Tests/QtAutogen/Adir/libA.h b/Tests/QtAutomoc/Adir/libA.h
similarity index 100%
rename from Tests/QtAutogen/Adir/libA.h
rename to Tests/QtAutomoc/Adir/libA.h
diff --git a/Tests/QtAutogen/Bdir/CMakeLists.txt b/Tests/QtAutomoc/Bdir/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/Bdir/CMakeLists.txt
rename to Tests/QtAutomoc/Bdir/CMakeLists.txt
diff --git a/Tests/QtAutogen/Bdir/libB.cpp b/Tests/QtAutomoc/Bdir/libB.cpp
similarity index 100%
rename from Tests/QtAutogen/Bdir/libB.cpp
rename to Tests/QtAutomoc/Bdir/libB.cpp
diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutomoc/Bdir/libB.h
similarity index 100%
rename from Tests/QtAutogen/Bdir/libB.h
rename to Tests/QtAutomoc/Bdir/libB.h
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt
similarity index 83%
rename from Tests/QtAutogen/CMakeLists.txt
rename to Tests/QtAutomoc/CMakeLists.txt
index 7991c4e..8ad693a 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutomoc/CMakeLists.txt
@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8)
-project(QtAutogen)
+project(QtAutomoc)
if (QT_TEST_VERSION STREQUAL 4)
find_package(Qt4 REQUIRED)
@@ -35,20 +35,15 @@ add_definitions(-DFOO -DSomeDefine="Barx")
# enable relaxed mode so automoc can handle all the special cases:
set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
# create an executable and two library targets, each requiring automoc:
add_library(codeeditorLib STATIC codeeditor.cpp)
add_library(privateSlot OBJECT private_slot.cpp)
-add_executable(QtAutogen main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
- xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
- test.qrc resourcetester.cpp
-)
+add_executable(foo main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
+ xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>)
-set_target_properties(QtAutogen codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE)
+set_target_properties(foo codeeditorLib privateSlot PROPERTIES AUTOMOC TRUE)
include(GenerateExportHeader)
# The order is relevant here. B depends on A, and B headers depend on A
@@ -64,7 +59,7 @@ set_target_properties(libC PROPERTIES AUTOMOC TRUE)
generate_export_header(libC)
target_link_libraries(libC LINK_PUBLIC libB)
-target_link_libraries(QtAutogen codeeditorLib ${QT_LIBRARIES} libC)
+target_link_libraries(foo codeeditorLib ${QT_LIBRARIES} libC)
add_library(empty STATIC empty.cpp)
set_target_properties(empty PROPERTIES AUTOMOC TRUE)
diff --git a/Tests/QtAutogen/abc.cpp b/Tests/QtAutomoc/abc.cpp
similarity index 100%
rename from Tests/QtAutogen/abc.cpp
rename to Tests/QtAutomoc/abc.cpp
diff --git a/Tests/QtAutogen/abc.h b/Tests/QtAutomoc/abc.h
similarity index 100%
rename from Tests/QtAutogen/abc.h
rename to Tests/QtAutomoc/abc.h
diff --git a/Tests/QtAutogen/abc_p.h b/Tests/QtAutomoc/abc_p.h
similarity index 100%
rename from Tests/QtAutogen/abc_p.h
rename to Tests/QtAutomoc/abc_p.h
diff --git a/Tests/QtAutogen/bar.cpp b/Tests/QtAutomoc/bar.cpp
similarity index 100%
rename from Tests/QtAutogen/bar.cpp
rename to Tests/QtAutomoc/bar.cpp
diff --git a/Tests/QtAutogen/blub.cpp b/Tests/QtAutomoc/blub.cpp
similarity index 100%
rename from Tests/QtAutogen/blub.cpp
rename to Tests/QtAutomoc/blub.cpp
diff --git a/Tests/QtAutogen/blub.h b/Tests/QtAutomoc/blub.h
similarity index 100%
rename from Tests/QtAutogen/blub.h
rename to Tests/QtAutomoc/blub.h
diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutomoc/calwidget.cpp
similarity index 99%
rename from Tests/QtAutogen/calwidget.cpp
rename to Tests/QtAutomoc/calwidget.cpp
index defde20..cbfa5a8 100644
--- a/Tests/QtAutogen/calwidget.cpp
+++ b/Tests/QtAutomoc/calwidget.cpp
@@ -49,10 +49,7 @@
#include "calwidget.h"
- #include "ui_calwidget.h"
-
Window::Window()
- : ui(new Ui::Window)
{
createPreviewGroupBox();
createGeneralOptionsGroupBox();
diff --git a/Tests/QtAutogen/calwidget.h b/Tests/QtAutomoc/calwidget.h
similarity index 98%
rename from Tests/QtAutogen/calwidget.h
rename to Tests/QtAutomoc/calwidget.h
index d21a473..8447389 100644
--- a/Tests/QtAutogen/calwidget.h
+++ b/Tests/QtAutomoc/calwidget.h
@@ -52,11 +52,6 @@
class QGroupBox;
class QLabel;
- namespace Ui
- {
- class Window;
- }
-
class Window : public QWidget
{
Q_OBJECT
@@ -121,8 +116,6 @@
QCheckBox *firstFridayCheckBox;
QCheckBox *mayFirstCheckBox;
-
- Ui::Window *ui;
};
#endif
diff --git a/Tests/QtAutogen/codeeditor.cpp b/Tests/QtAutomoc/codeeditor.cpp
similarity index 100%
rename from Tests/QtAutogen/codeeditor.cpp
rename to Tests/QtAutomoc/codeeditor.cpp
diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutomoc/codeeditor.h
similarity index 100%
rename from Tests/QtAutogen/codeeditor.h
rename to Tests/QtAutomoc/codeeditor.h
diff --git a/Tests/QtAutogen/defines_test/CMakeLists.txt b/Tests/QtAutomoc/defines_test/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/defines_test/CMakeLists.txt
rename to Tests/QtAutomoc/defines_test/CMakeLists.txt
diff --git a/Tests/QtAutogen/defines_test/defines_test.cpp b/Tests/QtAutomoc/defines_test/defines_test.cpp
similarity index 100%
rename from Tests/QtAutogen/defines_test/defines_test.cpp
rename to Tests/QtAutomoc/defines_test/defines_test.cpp
diff --git a/Tests/QtAutogen/empty.cpp b/Tests/QtAutomoc/empty.cpp
similarity index 100%
rename from Tests/QtAutogen/empty.cpp
rename to Tests/QtAutomoc/empty.cpp
diff --git a/Tests/QtAutogen/empty.h b/Tests/QtAutomoc/empty.h
similarity index 100%
rename from Tests/QtAutogen/empty.h
rename to Tests/QtAutomoc/empty.h
diff --git a/Tests/QtAutogen/foo.cpp b/Tests/QtAutomoc/foo.cpp
similarity index 100%
rename from Tests/QtAutogen/foo.cpp
rename to Tests/QtAutomoc/foo.cpp
diff --git a/Tests/QtAutogen/foo.h b/Tests/QtAutomoc/foo.h
similarity index 100%
rename from Tests/QtAutogen/foo.h
rename to Tests/QtAutomoc/foo.h
diff --git a/Tests/QtAutogen/gadget.cpp b/Tests/QtAutomoc/gadget.cpp
similarity index 100%
rename from Tests/QtAutogen/gadget.cpp
rename to Tests/QtAutomoc/gadget.cpp
diff --git a/Tests/QtAutogen/gadget.h b/Tests/QtAutomoc/gadget.h
similarity index 100%
rename from Tests/QtAutogen/gadget.h
rename to Tests/QtAutomoc/gadget.h
diff --git a/Tests/QtAutogen/libC.cpp b/Tests/QtAutomoc/libC.cpp
similarity index 100%
rename from Tests/QtAutogen/libC.cpp
rename to Tests/QtAutomoc/libC.cpp
diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutomoc/libC.h
similarity index 100%
rename from Tests/QtAutogen/libC.h
rename to Tests/QtAutomoc/libC.h
diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutomoc/main.cpp
similarity index 93%
rename from Tests/QtAutogen/main.cpp
rename to Tests/QtAutomoc/main.cpp
index c8a036e..bd80180 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutomoc/main.cpp
@@ -38,8 +38,7 @@
**
****************************************************************************/
-#include <QCoreApplication>
-#include <QTimer>
+#include <QApplication>
#include "codeeditor.h"
#include "calwidget.h"
@@ -50,11 +49,17 @@
#include "xyz.h"
#include "yaf.h"
#include "libC.h"
-#include "resourcetester.h"
int main(int argv, char **args)
{
- QCoreApplication app(argv, args);
+ QApplication app(argv, args);
+
+ CodeEditor editor;
+ editor.setWindowTitle(QObject::tr("Code Editor Example"));
+ editor.show();
+
+ Window w;
+ w.show();
Foo foo;
foo.doFoo();
@@ -77,9 +82,5 @@ int main(int argv, char **args)
LibC lc;
lc.foo();
- ResourceTester rt;
-
- QTimer::singleShot(0, &rt, SLOT(doTest()));
-
return app.exec();
}
diff --git a/Tests/QtAutogen/private_slot.cpp b/Tests/QtAutomoc/private_slot.cpp
similarity index 100%
rename from Tests/QtAutogen/private_slot.cpp
rename to Tests/QtAutomoc/private_slot.cpp
diff --git a/Tests/QtAutogen/private_slot.h b/Tests/QtAutomoc/private_slot.h
similarity index 100%
rename from Tests/QtAutogen/private_slot.h
rename to Tests/QtAutomoc/private_slot.h
diff --git a/Tests/QtAutogen/sub/bar.h b/Tests/QtAutomoc/sub/bar.h
similarity index 100%
rename from Tests/QtAutogen/sub/bar.h
rename to Tests/QtAutomoc/sub/bar.h
diff --git a/Tests/QtAutogen/xyz.cpp b/Tests/QtAutomoc/xyz.cpp
similarity index 100%
rename from Tests/QtAutogen/xyz.cpp
rename to Tests/QtAutomoc/xyz.cpp
diff --git a/Tests/QtAutogen/xyz.h b/Tests/QtAutomoc/xyz.h
similarity index 100%
rename from Tests/QtAutogen/xyz.h
rename to Tests/QtAutomoc/xyz.h
diff --git a/Tests/QtAutogen/yaf.cpp b/Tests/QtAutomoc/yaf.cpp
similarity index 100%
rename from Tests/QtAutogen/yaf.cpp
rename to Tests/QtAutomoc/yaf.cpp
diff --git a/Tests/QtAutogen/yaf.h b/Tests/QtAutomoc/yaf.h
similarity index 100%
rename from Tests/QtAutogen/yaf.h
rename to Tests/QtAutomoc/yaf.h
diff --git a/Tests/QtAutogen/yaf_p.h b/Tests/QtAutomoc/yaf_p.h
similarity index 100%
rename from Tests/QtAutogen/yaf_p.h
rename to Tests/QtAutomoc/yaf_p.h
-----------------------------------------------------------------------
Summary of changes:
Modules/AutogenInfo.cmake.in | 23 -
Modules/AutomocInfo.cmake.in | 14 +
Source/CMakeLists.txt | 4 +-
Source/cmDocumentVariables.cxx | 18 -
Source/cmGlobalGenerator.cxx | 27 +-
Source/cmGlobalGenerator.h | 2 +-
Source/cmMakefile.cxx | 10 -
Source/cmMakefile.h | 5 -
Source/{cmQtAutoGenerators.cxx => cmQtAutomoc.cxx} | 832 ++++----------------
Source/{cmQtAutoGenerators.h => cmQtAutomoc.h} | 48 +-
Source/cmSourceFile.cxx | 31 -
Source/cmTarget.cxx | 39 +-
Source/cmake.cxx | 10 -
Source/cmcmd.cxx | 10 +-
Tests/CMakeLists.txt | 37 +-
Tests/QtAutogen/calwidget.ui | 32 -
Tests/QtAutogen/resourcetester.cpp | 21 -
Tests/QtAutogen/resourcetester.h | 17 -
Tests/QtAutogen/test.qrc | 5 -
Tests/{QtAutogen => QtAutomoc}/Adir/CMakeLists.txt | 0
Tests/{QtAutogen => QtAutomoc}/Adir/libA.cpp | 0
Tests/{QtAutogen => QtAutomoc}/Adir/libA.h | 0
Tests/{QtAutogen => QtAutomoc}/Bdir/CMakeLists.txt | 0
Tests/{QtAutogen => QtAutomoc}/Bdir/libB.cpp | 0
Tests/{QtAutogen => QtAutomoc}/Bdir/libB.h | 0
Tests/{QtAutogen => QtAutomoc}/CMakeLists.txt | 17 +-
Tests/{QtAutogen => QtAutomoc}/abc.cpp | 0
Tests/{QtAutogen => QtAutomoc}/abc.h | 0
Tests/{QtAutogen => QtAutomoc}/abc_p.h | 0
Tests/{QtAutogen => QtAutomoc}/bar.cpp | 0
Tests/{QtAutogen => QtAutomoc}/blub.cpp | 0
Tests/{QtAutogen => QtAutomoc}/blub.h | 0
Tests/{QtAutogen => QtAutomoc}/calwidget.cpp | 3 -
Tests/{QtAutogen => QtAutomoc}/calwidget.h | 7 -
Tests/{QtAutogen => QtAutomoc}/codeeditor.cpp | 0
Tests/{QtAutogen => QtAutomoc}/codeeditor.h | 0
.../defines_test/CMakeLists.txt | 0
.../defines_test/defines_test.cpp | 0
Tests/{QtAutogen => QtAutomoc}/empty.cpp | 0
Tests/{QtAutogen => QtAutomoc}/empty.h | 0
Tests/{QtAutogen => QtAutomoc}/foo.cpp | 0
Tests/{QtAutogen => QtAutomoc}/foo.h | 0
Tests/{QtAutogen => QtAutomoc}/gadget.cpp | 0
Tests/{QtAutogen => QtAutomoc}/gadget.h | 0
Tests/{QtAutogen => QtAutomoc}/libC.cpp | 0
Tests/{QtAutogen => QtAutomoc}/libC.h | 0
Tests/{QtAutogen => QtAutomoc}/main.cpp | 17 +-
Tests/{QtAutogen => QtAutomoc}/private_slot.cpp | 0
Tests/{QtAutogen => QtAutomoc}/private_slot.h | 0
Tests/{QtAutogen => QtAutomoc}/sub/bar.h | 0
Tests/{QtAutogen => QtAutomoc}/xyz.cpp | 0
Tests/{QtAutogen => QtAutomoc}/xyz.h | 0
Tests/{QtAutogen => QtAutomoc}/yaf.cpp | 0
Tests/{QtAutogen => QtAutomoc}/yaf.h | 0
Tests/{QtAutogen => QtAutomoc}/yaf_p.h | 0
55 files changed, 221 insertions(+), 1008 deletions(-)
delete mode 100644 Modules/AutogenInfo.cmake.in
create mode 100644 Modules/AutomocInfo.cmake.in
rename Source/{cmQtAutoGenerators.cxx => cmQtAutomoc.cxx} (64%)
rename Source/{cmQtAutoGenerators.h => cmQtAutomoc.h} (68%)
delete mode 100644 Tests/QtAutogen/calwidget.ui
delete mode 100644 Tests/QtAutogen/resourcetester.cpp
delete mode 100644 Tests/QtAutogen/resourcetester.h
delete mode 100644 Tests/QtAutogen/test.qrc
rename Tests/{QtAutogen => QtAutomoc}/Adir/CMakeLists.txt (100%)
rename Tests/{QtAutogen => QtAutomoc}/Adir/libA.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/Adir/libA.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/Bdir/CMakeLists.txt (100%)
rename Tests/{QtAutogen => QtAutomoc}/Bdir/libB.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/Bdir/libB.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/CMakeLists.txt (83%)
rename Tests/{QtAutogen => QtAutomoc}/abc.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/abc.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/abc_p.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/bar.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/blub.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/blub.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/calwidget.cpp (99%)
rename Tests/{QtAutogen => QtAutomoc}/calwidget.h (98%)
rename Tests/{QtAutogen => QtAutomoc}/codeeditor.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/codeeditor.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/defines_test/CMakeLists.txt (100%)
rename Tests/{QtAutogen => QtAutomoc}/defines_test/defines_test.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/empty.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/empty.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/foo.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/foo.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/gadget.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/gadget.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/libC.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/libC.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/main.cpp (93%)
rename Tests/{QtAutogen => QtAutomoc}/private_slot.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/private_slot.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/sub/bar.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/xyz.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/xyz.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/yaf.cpp (100%)
rename Tests/{QtAutogen => QtAutomoc}/yaf.h (100%)
rename Tests/{QtAutogen => QtAutomoc}/yaf_p.h (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list