| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Fixes: #14155
|
|
|
|
|
|
|
|
|
| |
The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS
dir even if empty, 2017-11-19) regressed existing builds on some
machines. Revert it for CMake 3.11 pending further investigation.
Fixes: #17814, #17817
Issue: #14155, #17492
|
| |
|
|
|
|
|
| |
Fixes: #14155
Issue: #17492
|
|
|
|
|
|
|
|
|
|
|
| |
Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a),
the assumption made in "FindQt4.cmake" is not always valid and systematically
setting the imported libraries location to framework location is incorrect.
This commit increases the robustness of the logic by first checking
if the location exists.
Fixes #17195
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Per-source copyright/license notice headers that spell out copyright holder
names and years are hard to maintain and often out-of-date or plain wrong.
Precise contributor information is already maintained automatically by the
version control tool. Ultimately it is the receiver of a file who is
responsible for determining its licensing status, and per-source notices are
merely a convenience. Therefore it is simpler and more accurate for
each source to have a generic notice of the license name and references to
more detailed information on copyright holders and full license terms.
Our `Copyright.txt` file now contains a list of Contributors whose names
appeared source-level copyright notices. It also references version control
history for more precise information. Therefore we no longer need to spell
out the list of Contributors in each source file notice.
Replace CMake per-source copyright/license notice headers with a short
description of the license and links to `Copyright.txt` and online information
available from "https://cmake.org/licensing". The online URL also handles
cases of modules being copied out of our source into other projects, so we
can drop our notices about replacing links with full license text.
Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority
of the replacements mechanically. Manually fix up shebang lines and trailing
newlines in a few files. Manually update the notices in a few files that the
script does not handle.
|
| |
|
|
|
|
|
|
|
| |
Automate with:
find Modules -type f -print0 | xargs -0 perl -i -0pe \
's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
|
| |
|
|
|
|
|
|
|
| |
Fix capitalization of Qt4_FOUND variable when setting it to false in
this case. This caused find_package(Qt4) to appear successful when it
was not. Note that the legacy QT4_FOUND variable is unconditionally
overwritten at the end of the file with the value of Qt4_FOUND.
|
|
|
|
|
| |
Enable the Sphinx 'nitpicky' option and fix the resulting warnings about
dangling references.
|
|
|
|
| |
Help format the blocks better for display without a wide screen.
|
|
|
|
|
|
| |
Convert several preformatted code block literals that enumerate lists of
options or variables to use reST definition lists instead. Manually
wrap other long lines in code blocks.
|
|\
| |
| |
| |
| | |
4b5052b0 FindQt4: Add nativewifi and qtga plugins
|
| |
| |
| |
| |
| | |
While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS
instead of duplicating the list.
|
| |
| |
| |
| |
| |
| | |
If the only qmake that can be found belongs to Qt5 the find module
would otherwise still further interrogate it and issue diagnostics
which are specific to Qt4.
|
| |
| |
| |
| |
| |
| |
| | |
The FindQt4 module is a CMake Domain object of type "module".
Our convention for domain object document titles is "------"
and domain object document sections is "^^^^^^". Switch to
these within the FindQt4 documentation.
|
| |
| |
| |
| |
| |
| |
| | |
After finding qmake we search in QT_BINARY_DIR for the other Qt tools.
Try all versioned executable names before trying the plain executable name.
This makes it much more likely that if 2 different major versions are installed
in the same prefix CMake will be able to detect a proper set of tools.
|
|/
|
|
|
|
|
|
|
|
| |
Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and
find_package(Qt4 QUIET) would still print out messages when calling
check*() functions.
Also a partial fix for #14445 where building CMake
(without cmake-gui) when Qt5 is installed and Qt4 is not installed
and warnings come out of FindQt4.cmake.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
6053ce22 QtAutogen: Make uic work even when the source is in a subdir.
1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 321e348e (QtAutogen: Use Qt 4 IMPORTED targets to find
executable locations., 2014-01-24) attempted to fix this problem,
but only solved it for a particular ordering of find_package for
Qt 4 and Qt 5.
Add a test to ensure that it works with both orderings.
|
|/
|
|
|
|
|
|
| |
Add an introduction about the use of different package types, and the
ability to use Qt 4 and 5 versions together in a single buildsystem.
Add a section about automatic linking of the qtmain.lib library and
how to disable it.
|
|
|
|
|
| |
Qt 5 already has similar IMPORTED targets. The versioned namespace will
allow de-conflicting the variable names between Qt 4 and Qt 5.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove independent doc listing for Qt4ConfigurationSettings, Qt4Macros
and UseQt4. These are implementation details.
Recommend the use of IMPORTED targets.
Remove references to the UseQt4 file, which is obsolete in light of
the IMPORTED targets.
Add documentation for automatic tool invocation and options.
Remove reference to variables which should not be needed in modern
implementations.
|
|
|
|
|
| |
Feature introduced in commit 9ce60ff5 (Qt4Macros: Allow specifying
a TARGET in invokations of macros., 2013-02-26).
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
73e9340 get_target_property: Error on non-existent target.
ab9f58f FindQt4: Ensure target exists before calling get_target_property.
37ebeb9 FindQt4: Fix use of get_target_property to use actual target name.
6aabb6a Genex: Use case-sensitive comparison for COMPILER_ID.
5bb53f6 cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
|
| |
| |
| |
| |
| | |
This macro is called for all potential Qt targets, even those which were
not found.
|
| |
| |
| |
| |
| | |
This was introduced in ba48e63f (Generate config-specific interface
link libraries propeties., 2013-02-09).
|
|/
|
|
| |
Thanks to Thomas Petazzoni for part of this fix.
|
| |
|
|
|
|
|
| |
This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
|
|
|
|
|
|
|
|
| |
Run the convert-help.bash script to convert documentation:
./convert-help.bash "/path/to/CMake-build/bin"
Then remove it.
|
|\
| |
| |
| |
| | |
0f267c0 FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
|
| |
| |
| |
| |
| | |
This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties
obsolete.
|
|\ \
| |/
|/|
| |
| | |
d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
|
| |
| |
| |
| |
| | |
This was removed instead of moved in commit b8af46cb (FindQt4: Don't
fail if certain Qt modules are unavailable.).
|
|\ \
| |/
| |
| |
| | |
969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a regression introduced by commit b8af46cb (FindQt4: Don't
fail if certain Qt modules are unavailable., 2013-05-23)
The _FOUND variable is set by the _QT4_ADJUST_LIB_VARS macro, so
invoke that unconditionally, and guard only the set_property calls,
as described in the original bug report (#14165).
|
| |
| |
| |
| |
| | |
The QT_QMAKE_EXECUTABLE has to be passed through the cmake calls because
the executable may not be in the PATH.
|
|\ \
| |/
| |
| |
| | |
b8af46c FindQt4: Don't fail if certain Qt modules are unavailable.
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
|
| |/
| |
| |
| |
| |
| |
| |
| | |
The call
find_package(Qt4 QUIET)
should be non-FATAL in that case. This fixes #14142.
|
| |
| |
| |
| | |
API, Borland, MinGW, UNIX, Mac OS X.
|
|/ |
|
|\
| |
| |
| |
| | |
252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
|
| | |
|