diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-13 17:34:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-13 17:34:24 (GMT) |
| commit | 26bfece1af0e3b06778e56eddd9cdd1f448a5c77 (patch) | |
| tree | 4f02773d060565a5e40f1a40ab5d5e0a49cae7fd /Source/cmGlobalGenerator.cxx | |
| parent | 9a02a267021b4bced796ac73e1a69fd095883d15 (diff) | |
| parent | a223a3b65f518f59a73967f0087b0d67842d9f0d (diff) | |
| download | CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.zip CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.tar.gz CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.tar.bz2 | |
Merge topic 'fix-automoc-no-qt'
a223a3b Automoc: Don't create automoc targets if Qt is not used (#13999)
65b5c1e Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index fcd6f71..df14331 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1086,8 +1086,10 @@ void cmGlobalGenerator::CreateAutomocTargets() if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported()) { cmQtAutomoc automoc; - automoc.InitializeMocSourceFile(&target); - automocs.push_back(std::make_pair(automoc, &target)); + if(automoc.InitializeMocSourceFile(&target)) + { + automocs.push_back(std::make_pair(automoc, &target)); + } } } } |