Commit Graph

41 Commits

Author SHA1 Message Date
Clinton Stimpson
b94ecab6d6 FindQt4: prevent overlinking when using UseQt4.cmake.
Now it only links with the Qt libraries specified by the user,
instead of automatically including all dependencies.
Fixes #14750 and thanks to Orion Poplawski.
2014-02-26 10:55:38 -07:00
Stephen Kelly
2509c7678f Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)
Commit 5bb53f6b (cmTarget: Deprecate COMPILE_DEFINITIONS_ properties
with a policy., 2013-12-30) deprecated the config-specific
COMPILE_DEFINITIONS_* properties in favour of using generator
expressions.

Set the directory property in UseQt4.cmake to match the
INTERFACE_COMPILE_DEFINITIONS on the Qt4::QtCore and Qt5::Core
IMPORTED targets.  Setting QT_NO_DEBUG is sufficient because qglobal.h
sets the corresponding QT_DEBUG definition if required.
2014-01-13 15:53:00 +01:00
Clinton Stimpson
656716d794 qt4: Fix linking with QtSvg to not include QtXml.
Fixes issue #14505.
2013-10-23 07:04:02 -06:00
Kitware Robot
f051814ed0 Convert builtin help to reStructuredText source files
Run the convert-help.bash script to convert documentation:

 ./convert-help.bash "/path/to/CMake-build/bin"

Then remove it.
2013-10-15 14:12:03 -04:00
Clinton Stimpson
691ac05d40 Qt4: Add SYSTEM option to include_directories.
Thanks to Scott Bailey and Benjamin Kloster.
2012-12-03 08:00:07 -07:00
Kitware Robot
9db3116226 Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot
77543bde41 Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot
7bbaa4283d Remove trailing whitespace from most CMake and C/C++ code
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace.  Wipe out all remnants of trailing whitespace
everywhere except third-party code.

Run the following shell code:

git ls-files -z -- \
 bootstrap doxygen.config '*.readme' \
 '*.c' '*.cmake' '*.cpp' '*.cxx' \
 '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
 '*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
2012-08-13 14:18:39 -04:00
Clinton Stimpson
3cd08ce048 Qt4: Fix dependencies of QtDeclartive. 2011-11-29 09:02:40 -07:00
Mike McQuaid
cf4b52980d Add QT_LIBRARIES_PLUGINS variable to UseQt4. 2011-10-03 11:01:39 -06:00
Clinton Stimpson
5a2b208617 Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work. 2011-06-23 10:08:28 -06:00
Clinton Stimpson
5f983d1706 Qt4: complete module dependencies in UseQt4.cmake 2011-06-13 17:37:26 -06:00
Todd Gamblin
2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Clinton Stimpson
b55da4c688 Add cross-compiling support to FindQt4.cmake 2010-07-02 15:47:07 -06:00
Alex Neundorf
edb0fb2207 -add support for QtMultimedia in UseQt4.cmake (#10675)
Alex
2010-05-06 21:12:46 +02:00
Clinton Stimpson
70290e1f64 Add support for QtDeclartive module. 2010-02-17 19:12:18 -05:00
Alexander Neundorf
eb83c19789 -better support for Qt4 as frameworks
before this patch -F<framework> dir had to be added manually in some way
when using Qt4 installed as framework and when using FindQt4.cmake directly,
i.e. without UseQt4.cmake. With this patch the framework dir is
automatically added to QT_INCLUDE_DIR when Qt is installed as a framework.

Ok by Clinton, tested already in KDE by Mike Arthur.

Alex
2009-12-16 17:16:59 -05:00
Clinton Stimpson
56ee3b43a9 BUG: Fix #10021 don't specify libraries Qt depends on unless Qt is static. 2009-12-15 16:16:45 -05:00
Clinton Stimpson
023162256d QtHelp depends on QtNetwork 2009-10-01 16:12:39 -04:00
Brad King
3a666595c9 Convert CMake non-find modules to BSD License
This adds copyright/license notification blocks CMake's non-find
modules.  Most of the modules had no notices at all.  Some had notices
referring to the BSD license already.  This commit normalizes existing
notices and adds missing notices.
2009-09-28 11:46:51 -04:00
Clinton Stimpson
f4f5da869c ENH: Add support for QtScriptTools in Qt 4.5. 2009-05-06 09:42:01 -04:00
Clinton Stimpson
56ade2af43 ENH: Add support for building with Qt's ActiveX support on Windows. 2009-02-05 23:01:38 -05:00
Clinton Stimpson
26238d7d9a ENH: Better way to add framework includes. 2009-01-28 15:04:52 -05:00
Clinton Stimpson
f1916357f2 ENH: Should have a -F for framework includes on Mac. Fixes ParaView build with Qt 4.5 on Mac. 2009-01-23 17:37:44 -05:00
Clinton Stimpson
49db4e53a1 BUG: Fix #7934. phonon doesn't always depend on QtDBus. 2008-11-05 16:54:26 -05:00
Clinton Stimpson
e8af880a7d ENH: Similar to how qmake does it...
Don't add compile flags for dependent modules the user didn't specify.
      But still add the link libs.  This reduces the number of
      unecessary compile flags.
2008-05-19 18:07:00 -04:00
Clinton Stimpson
58a2872f2e ENH: Automatically add dependent modules.
For example, if QT_USE_QTXMLPATTERNS is on, QT_USE_QTNETWORK is turned on.
      The equivalent happens in a qmake .pro file when QT += xmlpatterns is specified.
2008-03-14 13:16:58 -04:00
Clinton Stimpson
5a112028b7 ENH: Add support for Qt 4.4's phonon module.
Add new Qt 4.4 modules in UseQt4.cmake
2008-03-13 19:12:46 -04:00
Clinton Stimpson
d94087ab44 ENH: Use new COMPILE_DEFINITIONS_* with set_property to
add Qt release/debug defines.
2008-02-01 12:02:19 -05:00
Clinton Stimpson
96d8460b4e ENH: Define QT_NO_DEBUG when building with release Qt libs.
Fixes #6104.
2007-11-30 19:11:18 -05:00
Alexander Neundorf
6fd330b9e8 ENH: support QtScript
Alex
2007-08-21 16:51:30 -04:00
Alexander Neundorf
4167622667 ENH: add QT_USE_QTDBUS as it exists for all other modules too
Alex
2007-01-04 16:50:18 -05:00
Brad King
608f735215 BUG: Patch from Clinton to restore proper QT3_SUPPORT macro definition. 2006-10-04 14:00:41 -04:00
Bill Hoffman
207292cf45 ENH: fixes from Clinton to allow qt to work with static libs 2006-09-06 08:31:50 -04:00
Bill Hoffman
1b58308b98 ENH: fix for optimized debug stuff 2006-08-01 12:27:53 -04:00
Bill Hoffman
7776d18896 ENH: fix qtmain for release 2006-08-01 11:26:32 -04:00
Bill Hoffman
4cafb72616 ENH: fix qtmain for release 2006-08-01 10:51:17 -04:00
Alexander Neundorf
f59ad1aa6e ENH: -apply the patches by Clinton Stimpson and Kenneth Moreland which fix
some QtMain issues on Windows
ENH: -sync with KDE svn FindQt4, which features a lot of enhancements

Alex
2006-04-27 15:07:23 -04:00
Bill Hoffman
b7fa820118 ENH: add documentation support for modules 2005-12-14 13:51:08 -05:00
Bill Hoffman
4dabf40ce3 ENH: add -D options for qt stuff 2005-09-12 09:09:47 -04:00
Bill Hoffman
b64b020f09 ENH: add Ken Morelands fixes for FindQT 2005-09-08 09:58:41 -04:00