summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutomoc.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-03-11 22:26:38 (GMT)
committerBrad King <brad.king@kitware.com>2013-03-12 21:42:02 (GMT)
commita223a3b65f518f59a73967f0087b0d67842d9f0d (patch)
tree19c8549420d979a291f91474aabad4b43f7a9c17 /Source/cmQtAutomoc.h
parent65b5c1e0645a466dbf5d163296754d12e2db53d5 (diff)
downloadCMake-a223a3b65f518f59a73967f0087b0d67842d9f0d.zip
CMake-a223a3b65f518f59a73967f0087b0d67842d9f0d.tar.gz
CMake-a223a3b65f518f59a73967f0087b0d67842d9f0d.tar.bz2
Automoc: Don't create automoc targets if Qt is not used (#13999)
Commit 79568f95 (automoc: Add source file to target early to set the linker language, 2013-02-20) changed automoc initialization to a two step process. In the first step, the generated source file was added to the target, which allows the link language to be determined. However, this bypassed the check for the availability of Qt itself. At build-time the automoc file could not be generated because the moc tool was not available to create it. The solution is to only add the automoc file to the target if Qt is found.
Diffstat (limited to 'Source/cmQtAutomoc.h')
-rw-r--r--Source/cmQtAutomoc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h
index 962e254..01b68fc 100644
--- a/Source/cmQtAutomoc.h
+++ b/Source/cmQtAutomoc.h
@@ -23,7 +23,7 @@ public:
cmQtAutomoc();
bool Run(const char* targetDirectory);
- void InitializeMocSourceFile(cmTarget* target);
+ bool InitializeMocSourceFile(cmTarget* target);
void SetupAutomocTarget(cmTarget* target);
private: