Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'findqt4-cross-compile' | Brad King | 2010-09-28 | 1 | -1/+3 |
|\ | | | | | | | | | 25931ae Fix regression in cross-compile patches with finding Qt libs. | ||||
| * | Fix regression in cross-compile patches with finding Qt libs. | Clinton Stimpson | 2010-09-23 | 1 | -1/+3 |
| | | | | | | | | | | | | If a Qt installation is in CMAKE_PREFIX_PATH and a QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation, prefer finding libs in the latter Qt installation. | ||||
* | | Modules: Fix spelling 'To distributed' -> 'To distribute' | Todd Gamblin | 2010-08-09 | 1 | -1/+1 |
|/ | |||||
* | Fix mingw/VS warning message with cross compile re-org. | Clinton Stimpson | 2010-07-15 | 1 | -8/+8 |
| | |||||
* | Find correct Qt plugins for cross-compiling. | Clinton Stimpson | 2010-07-06 | 1 | -1/+7 |
| | |||||
* | Fix some issues with refinding when qmake executable is changed. | Clinton Stimpson | 2010-07-06 | 1 | -0/+7 |
| | |||||
* | Tweak for cygwin, don't convert : to ; | Clinton Stimpson | 2010-07-03 | 1 | -2/+2 |
| | |||||
* | Add cross-compiling support to FindQt4.cmake | Clinton Stimpson | 2010-07-02 | 1 | -239/+222 |
| | |||||
* | Remove macro for querying qmake for qmake variables. | Clinton Stimpson | 2010-06-12 | 1 | -28/+0 |
| | | | | | | Remove last place for querying qmake values. Also removed internal macro to support querying qmake. Depends on findthreads-irix topic. | ||||
* | Change to use FindX11.cmake. Should fix #9929. | Clinton Stimpson | 2010-03-17 | 1 | -1/+1 |
| | |||||
* | ENH: Clarify a doc string. Fixes #10358. | Clinton Stimpson | 2010-03-17 | 1 | -1/+3 |
| | |||||
* | Add support for QtDeclartive module. | Clinton Stimpson | 2010-02-18 | 1 | -2/+9 |
| | |||||
* | -make the imported targets feature of FindQt4.cmake fully backwards compatible | Alexander Neundorf | 2010-01-18 | 1 | -42/+110 |
| | | | | | | | | | | | After discussing with Brad and Clinton: -the namespace for the imported targets is now "Qt4::", tested with Makefiles, Visual Studio and XCode projects -the imported targets are always created -if QT_USE_IMPORTED_TARGETS is set to TRUE (it defaults to FALSE), the QT_QTFOO_LIBRARY variables are set to point to these imported targets, otherwise the old behaviour is used. -on OSX if Qt has been found as framework, disable QT_USE_IMPORTED_TARGETS, since cmake doesn't handle the framework directory as location of the library correctly Alex | ||||
* | some tweaks as suggested by Brad (no functional changes) | Alexander Neundorf | 2010-01-18 | 1 | -16/+4 |
| | | | | | | | | | -set the type of the IMPORTED libraries to UNKNOWN, this way also on Windows only the "LOCATION" property has to be set -the if() around the SET(QT_${basename}_FOUND 1) was useless (always true) -the mapping of the configuration types DEBUG and PROFILE did not belong here Alex | ||||
* | -create imported library targets for the Qt4 libs | Alexander Neundorf | 2010-01-17 | 1 | -34/+32 |
| | | | | | | | | | | | | | | | | | This commit syncs FindQt4.cmake again with KDEs version. Now for every Qt library an imported target with the name Qt4ImportedTarget__<LIBNAME> is created. This way we can now finally handle the release and debug versions of the Qt libraries correctly. Also, if a Qt-using project A installs a file with exported targets, these targets now depend on the imported Qt targets, e.g. Qt4ImportedTarget__QtCore. The location of QtCore is then resolved at buildtime of project B, which uses the exported targets from project A. Before this patch the full path to the QtCore on the original build machine of project A was stored, so this had to match the directory layout on the build machine for project B. Alex | ||||
* | Fix bug #10114. Find phonon on some installations. | Clinton Stimpson | 2010-01-13 | 1 | -0/+10 |
| | |||||
* | fix logic of _QT4_ADJUST_LIB_VARS() wrt. release- and debug libraries | Alexander Neundorf | 2009-12-23 | 1 | -13/+15 |
| | | | | | | | | Now the case that both the release- and the debug-version of a library is handled first, because otherwise we always ran into this branch, since the debug-only and the release-only branch also set both variables. Alex | ||||
* | sync with KDE: sort the libs alphabetically | Alexander Neundorf | 2009-12-20 | 1 | -9/+8 |
| | | | | Alex | ||||
* | -add support for QtMultimedia and some sync with KDE | Alexander Neundorf | 2009-12-20 | 1 | -6/+11 |
| | | | | | | | -the QtMultimedia module is new since Qt 4.6.0 -sort the doc entries alphabetically Alex | ||||
* | -better support for Qt4 as frameworks | Alexander Neundorf | 2009-12-16 | 1 | -1/+10 |
| | | | | | | | | | | | 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 | ||||
* | also provide QT_DESIGNER_EXECUTABLE and QT_LINGUIST_EXECUTABLE | Alexander Neundorf | 2009-11-23 | 1 | -1/+18 |
| | | | | Alex | ||||
* | Don't search for QtMotif on all platforms - only on X11. | Clinton Stimpson | 2009-11-17 | 1 | -39/+46 |
| | |||||
* | Split some logic of FindQt4.cmake into separate files, which are included ↵ | Alexander Neundorf | 2009-11-15 | 1 | -672/+11 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
* | also search for "qmake-mac", which is installed by macports ↵ | Alexander Neundorf | 2009-11-12 | 1 | -1/+3 |
| | | | | | | (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2) Alex | ||||
* | Search for the header QtAssistant for QT_QTASSISTANT_INCLUDE_DIR instead of ↵ | Alexander Neundorf | 2009-11-10 | 1 | -1/+1 |
| | | | | | | | | | 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 | ||||
* | Sort documentation entries better and move mark_as_advanced() a bit back | Alexander Neundorf | 2009-11-09 | 1 | -12/+12 |
| | | | | Alex | ||||
* | -another tiny sync with KDE4, no functional changes | Alexander Neundorf | 2009-11-08 | 1 | -2/+6 |
| | | | | Alex | ||||
* | some syncing with FindQt4.cmake from KDE, no functional changes | Alexander Neundorf | 2009-11-08 | 1 | -9/+16 |
| | | | | | | | | -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 | ||||
* | Check for openssl-linked option with Qt 4.4+ before making ssl a dependency. | Clinton Stimpson | 2009-10-07 | 1 | -6/+15 |
| | |||||
* | When getting include dirs for moc, also watch for framework includes and use ↵ | Clinton Stimpson | 2009-10-05 | 1 | -1/+6 |
| | | | | -F instead of -I. | ||||
* | some syncing with the FindQt4.cmake from KDE | Alexander Neundorf | 2009-10-04 | 1 | -13/+13 |
| | | | | | | | | | -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 | ||||
* | -add the additional features for the dbus macros from KDE's FindQt4.cmake | Alexander Neundorf | 2009-10-03 | 1 | -7/+13 |
| | | | | Alex | ||||
* | document how the minimum version can be specified | Alexander Neundorf | 2009-10-01 | 1 | -54/+57 |
| | | | | Alex | ||||
* | Add documentation for Cocoa flag and move Motif under X11 flag. | Clinton Stimpson | 2009-10-01 | 1 | -1/+9 |
| | |||||
* | Convert CMake find-modules to BSD License | Brad King | 2009-09-28 | 1 | -0/+12 |
| | | | | | | | 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. | ||||
* | add support for finding qcollectiongenerator executable. fixes #9248. | Clinton Stimpson | 2009-09-22 | 1 | -9/+17 |
| | |||||
* | Add support for Qt configured with custom qtlibinfix (see issue 9571). Also ↵ | Clinton Stimpson | 2009-09-22 | 1 | -35/+36 |
| | | | | fix CMP 15 warnings. | ||||
* | Fix issue 9581. Qt 4.5+ needs gobject-2.0. | Clinton Stimpson | 2009-09-22 | 1 | -0/+27 |
| | |||||
* | use -o flag instead of > for qdbuscpp2xml | Clinton Stimpson | 2009-09-01 | 1 | -1/+1 |
| | |||||
* | BUG: fix relative paths from different drives on Windows | Clinton Stimpson | 2009-07-16 | 1 | -0/+3 |
| | |||||
* | ENH: Better error message for those who switch from Qt3 to Qt4 and don't ↵ | Clinton Stimpson | 2009-05-19 | 1 | -4/+4 |
| | | | | clean their cache file. | ||||
* | BUG: Fix spaces in file paths for lupdate command | Clinton Stimpson | 2009-05-06 | 1 | -1/+4 |
| | |||||
* | ENH: Add support for QtScriptTools in Qt 4.5. | Clinton Stimpson | 2009-05-06 | 1 | -0/+1 |
| | |||||
* | ENH: Add support for QtScriptTools in Qt 4.5. | Clinton Stimpson | 2009-05-06 | 1 | -1/+5 |
| | |||||
* | ENH: Do a recheck of QT_MAC_USE_COCOA when qmake executable changes. | Clinton Stimpson | 2009-03-26 | 1 | -0/+3 |
| | |||||
* | ENH: Support OUTPUT_LOCATION property for qm files. | Clinton Stimpson | 2009-03-25 | 1 | -1/+7 |
| | | | | Fixes #8492. | ||||
* | BUG: Need to fix find of qtmain library when qmake executable is changed. | Clinton Stimpson | 2009-03-19 | 1 | -0/+4 |
| | |||||
* | ENH: add patch from Debian, which adds support lrelease-qt4 and lupdate-qt4 | Alexander Neundorf | 2009-02-25 | 1 | -2/+2 |
| | | | | | | http://patch-tracking.debian.net/patch/series/view/cmake/2.6.3-1/FindQt4_qt4_lupdate_lrelease.diff Alex | ||||
* | ENH: Support COMPONENTS argument to find_package(). | Clinton Stimpson | 2009-02-19 | 1 | -17/+34 |
| | | | | See bug #8542. | ||||
* | ENH: Support version argument in find_package(). | Clinton Stimpson | 2009-02-19 | 1 | -2/+41 |
| | | | | See bug #8542. |