324 Commits

Author SHA1 Message Date
Sebastian Holtermann
251bcbed72 Autogen: Continue search for FOO_p.h when FOO.h was found 2017-07-02 22:54:35 +02:00
Sebastian Holtermann
dbda590628 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.
Closes #14760
Closes #14313
2017-05-26 15:27:17 +02:00
Sebastian Holtermann
0965002e57 Autogen: Pass build directory in Info file 2017-05-26 15:23:21 +02:00
Sebastian Holtermann
b95fbbe553 Autogen: Add -DWIN32 to definitions list on demand 2017-05-13 10:25:46 +02:00
Sebastian Holtermann
ab39dd11f5 Autogen: Include moc/uic/rcc binary in settings hash 2017-05-13 10:14:23 +02:00
Daniel Pfeifer
c36d63cd48 cmake: initialize with Role that controls which commands to register 2017-05-08 22:29:44 +02:00
Sebastian Holtermann
97d25404f3 Autogen: Use FileWrite to write the settings file 2017-04-22 15:12:45 +02:00
Sebastian Holtermann
d040459679 Autogen: Save the hash of the old settings string only 2017-04-22 14:54:34 +02:00
Sebastian Holtermann
7c5f5f1a20 Autogen: Generate moc_predefs.h only on demand 2017-04-22 14:39:50 +02:00
Sebastian Holtermann
1d5ed679ce Autogen: Uppercase function name 2017-04-22 14:28:13 +02:00
Sebastian Holtermann
e4a235653f Autogen: New QuotedCommand function for logging 2017-04-22 14:28:13 +02:00
Sebastian Holtermann
9d9e17fa21 Autogen: Use FileDiffers and FileWrite for AUTOMOC 2017-04-22 14:08:57 +02:00
Sebastian Holtermann
65290169f2 Autogen: Add FileDiffers and FileWrite methods 2017-04-22 14:01:18 +02:00
Sebastian Holtermann
344a6d8448 Autogen: MakeParentDirectory logPrefix parameter 2017-04-22 13:30:28 +02:00
Sebastian Holtermann
5965a58915 Autogen: Determine settings file name only once 2017-04-22 13:21:18 +02:00
Sebastian Holtermann
46ba6abe49 Autogen: Overhaul class variable names and sorting 2017-04-22 13:21:18 +02:00
Brad King
2b7aecba16 Merge topic 'autogen-fixes'
09035319 Autogen: Pass explicit predefines header to moc if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !671
2017-04-21 08:43:43 -04:00
Aleix Pol
0903531964 Autogen: Pass explicit predefines header to moc if possible
Qt is relying on whoever calls moc to include a file with the predefined
values that will be used by the compiler, otherwise moc takes wrong
paths and weird things happen.
Instead, generate an include file and feed it to all mocs to make sure
it's generating correct code.

Co-Author: Sebastian Holtermann <sebholt@xwmw.org>
Fixes: #16640
2017-04-20 08:59:07 -04:00
Daniel Pfeifer
1d829c862c Use quotes for non-system includes
Automate with:

git grep -l '#include <cm_' -- Source \
  | xargs sed -i 's/#include <\(cm_.*\)>/#include "\1"/g'

git grep -l '#include <cmsys/' -- Source \
  | xargs sed -i 's/#include <\(cmsys\/.*\)>/#include "\1"/g'

git grep -l '#include <cm[A-Z]' -- Source \
  | xargs sed -i 's/#include <\(cm[A-Z].*\)>/#include "\1"/g'
2017-04-11 22:35:21 +02:00
Sebastian Holtermann
60274e1d94 Autogen: Add RunCommand method with built in logging 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
8f2ad9c4a0 Autogen: Error return when a scan file is not readable 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
699321bfd5 Autogen: Add support for generated .qrc files 2017-03-06 22:01:02 +01:00
Sebastian Holtermann
a28ae16e3c Autogen: Embrace qrc file lists in braces in AutogenInfo.cmake
This allows empty .qrc files in any list position.
2017-03-06 22:01:02 +01:00
Sebastian Holtermann
47dbe9267e Autogen: Add cmQtAutogeneratorCommon class with shared types and functions 2017-03-06 22:01:02 +01:00
Sebastian Holtermann
3bf28f5ed0 Autogen: New short InfoGet functions 2017-03-02 09:10:03 -05:00
Sebastian Holtermann
154d8339f7 Autogen: Parse enabled feature configuration only 2017-03-02 09:10:03 -05:00
Sebastian Holtermann
ac77fa35c0 Autogen: Add missing return on error 2017-03-02 09:10:02 -05:00
Sebastian Holtermann
662ad240db Autogen: Rename and merge moc related methods 2017-03-02 09:10:02 -05:00
Sebastian Holtermann
1cdf7c1be2 Autogen: Add AUTOUIC_SEARCH_PATHS support
Closes #15227
2017-03-02 09:10:01 -05:00
Sebastian Holtermann
110c1bf475 Autogen: Add subDirPrefix function 2017-03-02 09:10:01 -05:00
Sebastian Holtermann
db431ecfe3 Autogen: Merge FindInIncludeDirectories into FindIncludeFile 2017-03-01 15:30:28 +01:00
Sebastian Holtermann
62a1e292f2 Autogen: Add hint to SKIP_AUTOMOC in error message
Closes #15751
2017-02-23 14:14:29 +01:00
Sebastian Holtermann
e98465cfed Autogen: Add Quote function and use it for logging 2017-02-23 14:14:29 +01:00
Sebastian Holtermann
70ebf35cda Autogen: Add AUTOMOC_DEPEND_FILTERS support 2017-02-22 21:13:48 +01:00
Sebastian Holtermann
2a6fd4328a Autogen: Single point of return in Run() method 2017-02-22 17:52:16 +01:00
Sebastian Holtermann
e9a8a207ad Autogen: Log simplifications 2017-02-22 17:44:35 +01:00
Brad King
dfebdd6218 Merge topic 'autogen_json'
29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test
d60f1ddc Autogen: Documentation update
cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support
8b13a52c Autogen: Tests: Set different compression levels in rcc test
9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation
0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function
754d4318 Autogen: Sort AutogenInfo.cmake.in
cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test
39c4819e Autogen: Tests: Add moc include tests
50805693 Autogen: Tests: Clean comments
c23206b6 Autogen: Log simplifications
347572cf Autogen: Only touch an unchanged moc_compilation.cpp
03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
3ec230de Autogen: Use GetRealPath in central places only
41fb64e7 Autogen: Search moc includes in include directories
175c8900 Autogen: Sort includes before composing include options
...
2017-02-22 10:15:48 -05:00
Sebastian Holtermann
754d431813 Autogen: Sort AutogenInfo.cmake.in
Also rename AM_SKIP_MOC to AM_MOC_SKIP
and AM_SKIP_UIC to AM_UIC_SKIP
2017-02-21 10:38:49 -05:00
Sebastian Holtermann
c23206b6c1 Autogen: Log simplifications
The logging methods now automatically add an end-of-line
to the message if it is missing.
2017-02-21 10:12:55 -05:00
Sebastian Holtermann
347572cf5e Autogen: Only touch an unchanged moc_compilation.cpp 2017-02-21 10:12:55 -05:00
Sebastian Holtermann
03df033bfa Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
Closes #15419
2017-02-21 10:12:54 -05:00
Sebastian Holtermann
3ec230de1f Autogen: Use GetRealPath in central places only 2017-02-21 10:12:54 -05:00
Sebastian Holtermann
41fb64e719 Autogen: Search moc includes in include directories 2017-02-21 10:12:54 -05:00
Sebastian Holtermann
175c890044 Autogen: Sort includes before composing include options 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
80a007534f Autogen: Add FindInIncludeDirectories method 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
ddf940725e Autogen: Split moc include paths on info reading 2017-02-21 10:12:53 -05:00
Sebastian Holtermann
71c5ae253c Autogen: Loop based macro detection instead of code duplication 2017-02-21 10:12:52 -05:00
Sebastian Holtermann
5308f954c9 Autogen: Issue a warning if moc isn't required in strict mode 2017-02-21 10:12:52 -05:00
Sebastian Holtermann
887e400341 Autogen: Error message tweaks 2017-02-21 10:12:51 -05:00
Sebastian Holtermann
4c60099fea Autogen: Acquire and store header extensions in Init() 2017-02-21 10:12:51 -05:00