e474dcb231
automoc: improved warning message in relaxed mode
...
Alex
2011-12-14 19:12:15 +01:00
96fc5d5d07
automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
...
automoc now defaults to strict mode, also with Qt4, i.e. it behaves as
the documentation says by default. I also inverted the switch
CMAKE_AUTOMOC_STRICT_MODE to CMAKE_AUTOMOC_RELAXED_MODE.
Docs and test adapted accordingly.
Alex
2011-12-13 22:11:47 +01:00
2d1195123e
Merge branch 'master' into AutomocIncludedDotMocFileHandling
...
Conflicts:
Source/cmTarget.cxx
2011-12-07 16:29:13 -05:00
bc278ceb0f
automoc: fix line length
...
Alex
2011-12-06 18:54:30 +01:00
62e223e8fa
automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
...
Alex
2011-12-02 22:08:06 +01:00
40c516783e
automoc: accept even more .moc files in non-strict mode
...
Alex
2011-12-02 21:54:11 +01:00
c207f5d361
automoc: also accept other files when .moc is included in non-strict mode
...
Alex
2011-12-02 21:43:15 +01:00
9c0df72dc4
automoc: add a StrictParseCppFile(), which is only qmake-compatible
...
ParseCppFile() is the one which is automoc4/KDE4-compatible, and which
becomes a bit crowded. By separating these two it is easier to ensure
that the strict one doesn't get broken accidentially.
Alex
2011-12-02 20:59:44 +01:00
174bf35fbb
automoc: move the code for finding headers into separate function
...
Alex
2011-12-02 20:38:14 +01:00
8507eaed16
automoc: fix handling of included _p.moc files
...
Alex
2011-11-30 21:43:05 +01:00
7ada172002
automoc: some more linebreaks for the warnings for better readability
...
Alex
2011-11-29 21:07:50 +01:00
3b93e266c0
automoc: add extra check whether the header contains Q_PRIVATE_SLOT
...
This is again for KDE4 compatiblity. If foo.moc is included, in general
moc should run on foo.cpp. Usually this can't cause problems.
It can only cause problems if moc must run on the header, and the resulting
file must be included in the cpp file, which is the case with the
Q_PRIVATE_SLOT macro.
This makes the test added by Stephen pass.
Alex
2011-11-29 20:55:36 +01:00
a8286235a3
moc is now part of the Qt5Core module
...
There is no separate SrcTools module anymore.
2011-11-26 15:15:33 +01:00
bde4edb6ab
automoc: add special handling for including basename_p.moc, with test
...
Alex
2011-11-22 22:01:13 +01:00
74ab0f6aa4
automoc: move some code from the big parsing loop into separate functions
...
Alex
2011-11-22 21:35:08 +01:00
72bb058e92
Automoc: modified handling of included .moc files
...
-enable the KDE4-compatiblity mode only when using Qt4
-always (except in the KDE4 compat mode) error out if a cpp-file
contains "Q_OBJECT", but does not include filename.moc
Alex
2011-11-16 22:35:06 +01:00
e44ebd5f9b
automoc: another runtime optimization
...
before doing the full regexp, try a simple strstr(), if this
already fails, no need to do the regexp matching.
Alex
2011-11-10 22:54:44 +01:00
1423177828
automoc: minor optimization
...
Handing th std::string instead the char* to the find()
reduces the time from 17 to 15 seconds (for a 1000 times loop of a
relatively small file), which is around 10 percent.
Alex
2011-11-10 22:41:48 +01:00
f98e6151dc
automoc: improved diagnostics
...
Error/warning messages now look like:
AUTOMOC: (error|warning): <filename>: the actual text...
Alex
2011-11-10 22:12:03 +01:00
81c43b4fb6
automoc: handle the case when the developer includes the wrong mocfile
...
There are multiple/many places in KDE where the developer includes
moc_foo.cpp, and expects moc to run on foo.cpp, instead of foo.h.
He should use foo.moc, but right now this is handled by automoc4,
so we must stay compatible. So support this too, but warn about
it.
Alex
2011-11-10 22:12:03 +01:00
7242822897
automoc: rework the checking for the matching header, to give better warnings
...
Alex
2011-11-10 22:12:03 +01:00
d08bc32bc2
automoc: stricter checking for what file is included
...
foo.cpp must include foo.moc to have itself processed by moc
Alex
2011-11-10 22:11:32 +01:00
b8c8cab242
Merge remote-tracking branch 'origin/master' into automoc_qt5
2011-11-10 15:46:13 +01:00
bafe5cc6e9
Fix style.
2011-11-10 00:57:21 +01:00
74b9392eb9
Update comments and method names to not be Qt4 specific.
2011-11-09 23:26:09 +01:00
812dab067e
Don't assume the existence of QT_MAJOR_VERSION.
...
Also handle Qt5SrcTools_MAJOR_VERSION.
2011-11-09 23:20:20 +01:00
a5579b76f0
Merge topic 'FixAutomocFromCCMakeFromPATH'
...
83d02ee#12551 )
2011-11-08 14:43:38 -05:00
3452dadf89
Merge topic 'AddMocOptionsToAutomoc'
...
2c648ab52719a1fix #12541 , support moc options
2011-11-08 14:42:51 -05:00
6c2f30822b
Merge topic 'DontCrashAutomocWithEmptyCompileDefs'
...
1ecc55a8c8305f
2011-11-08 14:42:46 -05:00
83d02ee52b
make automoc work when using ccmake via PATH ( #12551 )
...
In ccmake, cmake::GetCMakeCommand() returns "/cmake" when ccmake
was started from the PATH, i.e. by simply running "ccmake"
Alex
2011-11-03 22:55:42 +01:00
c208ab8d5c
Also run moc automatically with Qt5.
...
The method of running moc hasn't changed in Qt5.
2011-11-01 14:48:45 +01:00
52719a1d66
automoc: fix #12541 , support moc options
...
This commit adds a new target property AUTOMOC_MOC_OPTIONS, which
can be set to add extra options for the moc invocations done via automoc.
This is equivalent to the OPTIONS parameter in the qt4_wrap_cpp() macro.
Alex
2011-11-01 14:33:11 +01:00
1ecc55aa7b
Automoc: fix the fix, need to use std::string, not just char* pointer
...
We need to take a copy of the property values, since the returned
char* pointer is reused by the following GetProperty() calls
Alex
2011-11-01 13:59:14 +01:00
8c8305f286
don't crash in automoc with empty COMPILE_DEFINITIONS property
...
Reported by Laszlo Papp:
http://www.cmake.org/pipermail/cmake/2011-October/047089.html
Alex
2011-10-31 22:07:12 +01:00
5e8e9ad68c
automoc: always run moc on the cpp file if there is a foo.moc included
...
This makes automoc behaves as the documentation says.
If there is a #include "foo.moc" in the source file, moc
will be executed on foo.cpp.
Before it was also executed on foo.cpp, but only if foo.cpp
contained a Q_OBJECT macro, otherwise moc was executed on
foo.h. This was confusing, and this change also shouldn't break
anything, since the headers are moc'ed anyway if they contain
a Q_OBJECT macro.
Alex
2011-10-22 21:16:39 +02:00
ea8ac9f5dc
Add copyright notices
...
Alex
2011-10-22 19:43:34 +02:00
56aa6ffae7
automoc:run moc on the header if the source file contains include "foo.moc"
...
This fixes #12533 .
Before automoc did not check the header if the source file contained a
statement, now it does.
Additionally, moc is now only run on explicitely listed headers which
contain a Q_OBJECT macro.
Alex
2011-10-22 19:38:39 +02:00
7bf2c1aa3e
Create moc files in the current binary dir, not the top level.
2011-08-25 21:39:51 +02:00
920a046015
QtAutomoc: Eliminate compiler warning
2011-08-19 14:18:11 -04:00
71165e943e
Silence warning in automoc: use long instead of int
...
Alex
2011-08-18 19:34:49 +02:00
1879bcc09c
Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out
...
Alex
2011-08-18 18:53:14 +02:00
afb3edc181
Fix warnings
...
Alex
2011-08-17 00:49:12 +02:00
add30e9008
Fix build: non-void function must return a value
...
Alex
2011-08-17 00:39:21 +02:00
d045fd4ec5
Nicer progress message for the automoc target
...
Alex
2011-08-16 02:00:36 +02:00
c27607baf8
Refactor SetupAutomocTarget() so it can be run after creating the target
...
This makes it easier to move it from InitialPass() to some other
location, e.g. FinalPass() or something else.
Alex
2011-08-16 01:27:30 +02:00
58b7fe6545
Use cout instead of printf()
...
Alex
2011-08-14 17:17:01 +02:00
72caf4d178
Add the generated automoc.cpp file to the cleaned files
...
Alex
2011-08-14 17:06:34 +02:00
ddb517d014
Color output when running moc
...
Alex
2011-08-14 16:43:04 +02:00
93032953af
Initialize verbose based onb the env.var.
...
Alex
2011-08-14 15:58:09 +02:00
ace121534d
Move code for parsing a cpp-file from the big loop to separate function
...
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf
David Cole
Stephen Kelly