Commit Graph

180 Commits

Author SHA1 Message Date
Clinton Stimpson f756b73ac5 Don't search for QtMotif on all platforms - only on X11. 2009-11-17 14:44:33 -05:00
Alexander Neundorf 0f457937f4 Split some logic of FindQt4.cmake into separate files, which are included automatically.
Qt4Macros.cmake: all the "public" macros of FindQt4.cmake
Qt4ConfigDependentSettings.cmake: the code for detecting the
Qt-configuration dependent additional libraries, e.g. when linking statically.

There should be no functional changes in this patch.
The patch reduces the length of FindQt4.cmake from 1700 lines to around 1000
lines, which is still long enough, but this should make the file a easier to
handle (and it is similar to what we do in KDE with FindKDE4Internal.cmake
and KDE4Macros.cmake)

Ok by Clinton.

Alex
2009-11-15 13:02:19 -05:00
Alexander Neundorf fb8d583054 also search for "qmake-mac", which is installed by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2)
Alex
2009-11-12 12:55:19 -05:00
Alexander Neundorf 35a209b0db Search for the header QtAssistant for QT_QTASSISTANT_INCLUDE_DIR instead of QtAssistantClient
This should not change the result (since both should be in the same
directory), but seems a bit more logical and is also in sync with what is done in the KDE version.

Alex
2009-11-10 13:57:21 -05:00
Alexander Neundorf 4a2f809124 Sort documentation entries better and move mark_as_advanced() a bit back
Alex
2009-11-09 12:55:46 -05:00
Alexander Neundorf 054eed5819 -another tiny sync with KDE4, no functional changes
Alex
2009-11-08 13:21:09 -05:00
Alexander Neundorf e325b1a38a some syncing with FindQt4.cmake from KDE, no functional changes
-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn

Alex
2009-11-08 13:01:46 -05:00
Clinton Stimpson cff3a4420b Check for openssl-linked option with Qt 4.4+ before making ssl a dependency. 2009-10-07 18:51:39 -04:00
Clinton Stimpson bca63bb738 When getting include dirs for moc, also watch for framework includes and use -F instead of -I. 2009-10-05 11:21:30 -04:00
Alexander Neundorf e364dc784f some syncing with the FindQt4.cmake from KDE
-remove the parentheses in the if() conditions, they don't change the
result, and without them these lines are identical to the ones in
FindQt4.cmake from KDE
-mention which qmake was used for finding Qt

Alex
2009-10-04 11:31:30 -04:00
Alexander Neundorf 3563e6f44e -add the additional features for the dbus macros from KDE's FindQt4.cmake
Alex
2009-10-03 12:04:15 -04:00
Alexander Neundorf 61a1ec5f20 document how the minimum version can be specified
Alex
2009-10-01 16:48:19 -04:00
Clinton Stimpson 86459a89a1 Add documentation for Cocoa flag and move Motif under X11 flag. 2009-10-01 16:41:00 -04:00
Brad King c4bb9c9d42 Convert CMake find-modules to BSD License
This adds copyright/license notification blocks CMake's find-modules.
Many 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:45:50 -04:00
Clinton Stimpson 36606b6d73 add support for finding qcollectiongenerator executable. fixes #9248. 2009-09-22 18:44:24 -04:00
Clinton Stimpson 3551bc31f1 Add support for Qt configured with custom qtlibinfix (see issue 9571). Also fix CMP 15 warnings. 2009-09-22 16:28:13 -04:00
Clinton Stimpson ad5a455bb5 Fix issue 9581. Qt 4.5+ needs gobject-2.0. 2009-09-21 23:07:44 -04:00
Clinton Stimpson d6e8ffa927 use -o flag instead of > for qdbuscpp2xml 2009-09-01 15:21:06 -04:00
Clinton Stimpson e13176e92b BUG: fix relative paths from different drives on Windows 2009-07-16 18:53:20 -04:00
Clinton Stimpson c171d57ed0 ENH: Better error message for those who switch from Qt3 to Qt4 and don't clean their cache file. 2009-05-19 11:38:18 -04:00
Clinton Stimpson 22f1c78677 BUG: Fix spaces in file paths for lupdate command 2009-05-06 11:21:22 -04:00
Clinton Stimpson 2d22e11a4a ENH: Add support for QtScriptTools in Qt 4.5. 2009-05-06 09:44:36 -04:00
Clinton Stimpson f4f5da869c ENH: Add support for QtScriptTools in Qt 4.5. 2009-05-06 09:42:01 -04:00
Clinton Stimpson ff561cd1d3 ENH: Do a recheck of QT_MAC_USE_COCOA when qmake executable changes. 2009-03-26 11:04:18 -04:00
Clinton Stimpson 6a6ade8de2 ENH: Support OUTPUT_LOCATION property for qm files.
Fixes #8492.
2009-03-25 15:29:46 -04:00
Clinton Stimpson 55a6042d9c BUG: Need to fix find of qtmain library when qmake executable is changed. 2009-03-19 15:44:54 -04:00
Alexander Neundorf bc8f2f50a8 ENH: add patch from Debian, which adds support lrelease-qt4 and lupdate-qt4
http://patch-tracking.debian.net/patch/series/view/cmake/2.6.3-1/FindQt4_qt4_lupdate_lrelease.diff

Alex
2009-02-25 16:29:29 -05:00
Clinton Stimpson 08ca8f5053 ENH: Support COMPONENTS argument to find_package().
See bug #8542.
2009-02-19 16:04:57 -05:00
Clinton Stimpson abdcf91422 ENH: Support version argument in find_package().
See bug #8542.
2009-02-19 15:51:43 -05:00
Clinton Stimpson 2b4a472e81 ENH: Allowing finding a relocated Qt installation which contains a qt.conf to override the hardcoded paths in qmake.
Fixes #8532.
2009-02-13 18:52:02 -05:00
Clinton Stimpson 54e258414d ENH: Change FILEPATH to STRING for a list of libraries. 2009-02-10 18:13:24 -05:00
Clinton Stimpson dda19cd36f ENH: Support .hpp with automoc. 2009-02-09 16:42:19 -05:00
Clinton Stimpson f26c235aba BUG: When detecting if qmake executable is changed, don't error if path
contains regex chars.
2009-02-07 12:23:02 -05: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 f9710e22ec ENH: Also find .moc files if there are spaces between # and include.
Fixes #8433.
2009-01-29 13:26:01 -05:00
Clinton Stimpson aad46d7989 BUG: Fixed recent regression when finding some includes. 2009-01-26 10:12:37 -05:00
Clinton Stimpson b2d52b07ad ENH: Add convenience for identifying Cocoa based Qt. 2009-01-23 16:52:15 -05:00
Clinton Stimpson 515ce9315d BUG: Fix for #8247.
Add QT_TRANSLATIONS_DIR pointing to the Qt translation files, and docs for it.
      Also add docs for QT_BINARY_DIR.
2008-12-15 18:48:48 -05:00
Clinton Stimpson 25eeb3c47c BUG: Revert 1.138. 2008-11-25 16:56:44 -05:00
Clinton Stimpson e8e4160cce BUG: Fix #7969. Fix moc output files if source dir contains regex characters. 2008-11-05 17:56:55 -05:00
Clinton Stimpson 66db462bbe BUG: Fix find of assistant on Mac. 2008-10-24 17:48:35 -04:00
Clinton Stimpson f33943036e BUG: Fix regression in finding QtAssistant 2008-10-20 13:31:50 -04:00
Clinton Stimpson b82eb2b9b3 ENH: better way to find uic and moc. 2008-10-15 18:05:07 -04:00
Clinton Stimpson 9b2744f6fe ENH: When changing the qmake pointed to, re-find all of Qt's includes, libraries, etc...
This makes it much easier to switch between Qt versions.
2008-10-13 22:12:54 -04:00
Clinton Stimpson ca8c4ea4a6 BUG: Fix find of dbus dependency in Qt 4.4 2008-10-13 19:39:47 -04:00
Clinton Stimpson db0e1fd675 ENH: Fix #7784. Fix link of glib when needed. 2008-10-07 10:35:22 -04:00
Clinton Stimpson 33e87980cb ENH: Fix #7433. Put list of files in a .pro file and call lupdate on it,
instead of putting the list of files on the command line.
2008-09-22 15:00:31 -04:00
Clinton Stimpson ae9f9e6994 BUG: remove debug statements. 2008-09-22 14:00:37 -04:00
Clinton Stimpson 139cae931e ENH: For #7433, add a bit more documentation and add ability
to specify extra flags to lupdate.
2008-09-18 10:56:58 -04:00
Clinton Stimpson 87a31b5b7f ENH: For #7433, add documentation that directories also can be specified to
update the translation files.
2008-08-30 09:39:33 -04:00