diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-28 15:23:09 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-28 15:23:09 -0400 |
| commit | fcbe435c235f4fe1e5444a796f085c7a796be88e (patch) | |
| tree | 00e4f9eff8f5dc77251c61edbd8a81dbdefb48ad /Source/cmGlobalGenerator.h | |
| parent | 16df2456a440d87fb3e8e53fb59a2817b288b9af (diff) | |
| parent | 9c87d9cc3e7a046f79ff62eda81203ef424e4a14 (diff) | |
| download | cmake-fcbe435c235f4fe1e5444a796f085c7a796be88e.tar.gz | |
Merge topic 'Qt-auto-generators'
9c87d9c Add automatic rcc invocation for Qt.
84218e1 Add automatic uic invocation for Qt.
94a0ca6 Record which files are skipped by automoc.
18fb758 Run the main executable created in the autogen tests.
e485ba1 Rename the QtAutomoc tests to QtAutogen.
7ce65c3 Add extra checks for the AUTOMOC target property.
32771fc Update output messages for generic use.
f371ab5 Rename RunAutomoc to RunAutogen.
85b3d6e Extract an SetupAutoMocTarget method.
ca124a1 Rename the AutomocInfo.cmake file to be more generic.
a342c9f Move some makefile definitions up away from moc-specific code.
98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER.
63378ba Rename some variables to reflect broader scope.
97f1aa3 Rename method to reflect generic use.
4abb111 Rename local variable to reflect generic use.
03878c9 Move variable set to where it is used.
...
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 3c4ddb2a39..1538cb59a7 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -319,7 +319,7 @@ protected: virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS(); bool CheckTargets(); - void CreateAutomocTargets(); + void CreateQtAutoGeneratorsTargets(); // Fill the ProjectMap, this must be called after LocalGenerators |