| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
It will be extended to process .ui and .qrc files too.
|
|
|
|
|
|
|
| |
Instead of always using the includes and defines which are not
config-specific, ensure that the config specific ones can be used.
Task-number: #13589
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 79568f95 (automoc: Add source file to target early to set the
linker language, 2013-02-20) changed automoc initialization to a two
step process. In the first step, the generated source file was added
to the target, which allows the link language to be determined.
However, this bypassed the check for the availability of Qt itself.
At build-time the automoc file could not be generated because the moc
tool was not available to create it.
The solution is to only add the automoc file to the target if Qt is
found.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, GetIncludeDirectories was called before calling
target->AddSourceFile(mocCppSource). Since commit a1c4905f (Use the
link information as a source of compile definitions and
includes., 2013-02-12), the include directories are determined by
the link information.
Valid link information requires that the linker language can be
determined, which depends on the source files languages and the
dependent targets languages. In the case of the no_link_languages
target in the unit test, there are no dependencies and the additional
source file no_link_languages_automoc.cpp is added to the target
at generate-time. That file can be used to determine the linker
language, but it must be added to the target before calling
GetIncludeDirectories.
|
|
|
|
|
|
|
| |
Instead of having an own set of C header extensions, use
cmMakefile::GetHeaderExtensions() (#13904)
Alex
|
|
|
|
| |
Alex
|
|
|
|
|
|
|
| |
The docs say that this is for cmake 2.4 backwards compatibility only,
so we probably don't need to support it.
Alex
|
|
|
|
|
|
|
|
| |
Until now it was only rerun if the compile definitions changed, but
of course it also has to rerun if the include dirs or moc options
change. Strange that I didn't notice this before...
Alex
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| | |
Conflicts:
Source/cmTarget.cxx
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
bafe5cc Fix style.
74b9392 Update comments and method names to not be Qt4 specific.
812dab0 Don't assume the existence of QT_MAJOR_VERSION.
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Alex
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
| |
Alex
|
|
|
|
| |
Alex
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
This makes it easier to move it from InitialPass() to some other
location, e.g. FinalPass() or something else.
Alex
|
|
|
|
| |
Alex
|
|
|
|
| |
Alex
|
|
|
|
| |
Alex
|
|
|
|
|
|
|
| |
Instead it now relies on cmake time to put that information
correctly into AutomocInfo.cmake
Alex
|
|
|
|
|
|
|
|
|
| |
It already works :-)
Needs more refactoring, e.g. using the cmake facilities to turn a string
into a vector etc.
Also still missing is the part which creates the custom target.
Alex
|
|
|
|
| |
Alex
|
|
Alex
|