https://github.com/Kitware/CMake
Revision 753b905ec86ffe369d4f59a7a8ced5fedc42939f authored by Stephen Kelly on 17 March 2013, 18:40:37 UTC, committed by Brad King on 19 March 2013, 23:36:42 UTC
The commit d2536579 (Automoc: fix regression #13667, broken build in phonon, 2012-11-19) changed Automoc to try to re-add the Qt header dir if it was stripped out as an implicit include from the moc command line. When invoking a compiler, those directories are stripped out because they are built-in, but for moc, there are no built-in directories. The follow-up commit acc22400 (Automoc: get include dirs without stripping implicit include dirs off, 2012-12-07) went further by not removing the implicit include dirs, if they were specified specifically by the user. This had the remaining problem that the implicit include dirs appeared in a different order of precedence for moc compared to the compiler. Resolve that by stripping out the include dirs, where specified for the moc command line to, and then appending them at the end. Note that the order of the appended implicit include directories is the order they are specified in the CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, not the order specified by the user.
1 parent d7a2a9c
Tip revision: 753b905ec86ffe369d4f59a7a8ced5fedc42939f authored by Stephen Kelly on 17 March 2013, 18:40:37 UTC
Automoc: append implicit includes after user-specified dirs
Automoc: append implicit includes after user-specified dirs
Tip revision: 753b905
| File | Mode | Size |
|---|---|---|
| Docs | ||
| Example | ||
| Modules | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .gitattributes | -rw-r--r-- | 569 bytes |
| .hooks-config.bash | -rw-r--r-- | 866 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 5.3 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 3.4 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 24.8 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CTestConfig.cmake | -rw-r--r-- | 1.0 KB |
| CTestCustom.cmake.in | -rw-r--r-- | 3.3 KB |
| CTestCustom.ctest.in | -rw-r--r-- | 145 bytes |
| ChangeLog.manual | -rw-r--r-- | 186.1 KB |
| ChangeLog.txt | -rw-r--r-- | 2.5 MB |
| CompileFlags.cmake | -rw-r--r-- | 2.5 KB |
| Copyright.txt | -rw-r--r-- | 2.6 KB |
| DartConfig.cmake | -rw-r--r-- | 809 bytes |
| DartLocal.conf.in | -rw-r--r-- | 4.0 KB |
| Readme.txt | -rw-r--r-- | 1.9 KB |
| bootstrap | -rwxr-xr-x | 52.2 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 796 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
