summaryrefslogtreecommitdiffstats
path: root/Tests/QtAutomoc/Adir
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'Automoc-Qt4-Qt5'Brad King2013-05-211-1/+1
|\ | | | | | | | | | | | | 6489015 Remove an endif() followed by an if() for the same condition. e7813b1 Add a test for Qt5Automoc 27fb96b Make the QtAutomoc test compile with either Qt 4 or Qt 5
| * Add a test for Qt5AutomocStephen Kelly2013-03-161-1/+1
| | | | | | | | The same source is used as for the Qt4Automoc test.
* | Rename variable for including current directory in interfacesBrad King2013-03-191-1/+1
|/ | | | | | | | | Rename the variable added by commit 9ce1b9ef (Add CMAKE_BUILD_INTERFACE_INCLUDES build-variable, 2012-11-25) to CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE to be more consistent with the existing CMAKE_INCLUDE_CURRENT_DIR variable. Suggested-by: Alex Neundorf <neundorf@kde.org>
* Ensure that the build interface includes have been added.Stephen Kelly2013-02-083-0/+39
This is needed in the case that Automoc is used, as that calls GetIncludeDirectories, which may cache the resulting include dirs too early in the generate step. Also, because the automoc step is so early, we can't cache the include directories at that point. At that point the build interface of all dependencies are not populated yet, so we'd be caching the includes before appending the build interface. Only start caching when we're definitely generating the buildsystem. At that point, the includes should be stable. We still need to invoke AppendBuildInterfaceIncludes in the GlobalGenerator because the build interface includes affect mostly the dependencies of targets (such as the automoc targets), rather than the targets themselves, so the build interface needs to be appended for all targets before generation is done.