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

moc is now part of the Qt5Core module 

There is no separate SrcTools module anymore.
This commit is contained in:
Stephen Kelly 2011-11-26 15:15:33 +01:00
parent b8c8cab242
commit a8286235a3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/AutomocInfo.cmake.in
View File

@ -11,5 +11,5 @@ set(AM_QT_MOC_EXECUTABLE "@QT_MOC_EXECUTABLE@")
set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" ) set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" )
set(AM_Qt5SrcTools_VERSION_MAJOR "@Qt5SrcTools_VERSION_MAJOR@" ) set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" )
set(AM_TARGET_NAME "@_moc_target_name@") set(AM_TARGET_NAME "@_moc_target_name@")

6
Source/cmQtAutomoc.cxx
View File

@ -49,11 +49,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
{ {
cmMakefile* makefile = target->GetMakefile(); cmMakefile* makefile = target->GetMakefile();
const char* targetName = target->GetName(); const char* targetName = target->GetName();
// don't do anything if there is no Qt4 or Qt5SrcTools (which contains moc): // don't do anything if there is no Qt4 or Qt5Core (which contains moc):
std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR"); std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
if (qtMajorVersion == "") if (qtMajorVersion == "")
{ {
qtMajorVersion = makefile->GetSafeDefinition("Qt5SrcTools_VERSION_MAJOR"); qtMajorVersion = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
} }
if (qtMajorVersion != "4" && qtMajorVersion != "5") if (qtMajorVersion != "4" && qtMajorVersion != "5")
{ {
@ -229,7 +229,7 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
if (this->QtMajorVersion == "") if (this->QtMajorVersion == "")
{ {
this->QtMajorVersion = makefile->GetSafeDefinition( this->QtMajorVersion = makefile->GetSafeDefinition(
"AM_Qt5SrcTools_VERSION_MAJOR"); "AM_Qt5Core_VERSION_MAJOR");
} }
this->Sources = makefile->GetSafeDefinition("AM_SOURCES"); this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
this->Headers = makefile->GetSafeDefinition("AM_HEADERS"); this->Headers = makefile->GetSafeDefinition("AM_HEADERS");