aboutsummaryrefslogtreecommitdiff
path: root/modules/FindQt4.cmake
AgeCommit message (Collapse)Author
2011-06-30Move the modules, modules-test and systeminfo subdirs into 'attic'Allen Winter
2010-12-10FindQt4.cmake: Merge cfba5ef1 from upstream CMake:Kevin Kofler
http://cmake.org/gitweb?p=cmake.git;a=commit;h=cfba5ef111bf86e8820a4dff556b3a9edc1484cd Fix regression in 2dae2f1 which added find of Qt imports dir. 2dae2f1 was previously merged by mart. This breaks finding qmake-qt4 when there's also a Qt 3 qmake around, the Qt 3 qmake is no longer recognized as bad. The above fix from upstream CMake fixes that. CCMAIL: mart@kde.org CCMAIL: neundorf@kde.org CCMAIL: rdieter@math.unl.edu svn path=/trunk/KDE/kdelibs/; revision=1205274
2010-10-10add QT_IMPORTS_DIR (directory where imports are installed, at theMarco Martin
moment they are all QML plugins) to FindQt4.cmake this change was done to upstream CMake before. this is a backport of the commit 2dae2f1a0b24c674b651fd6edf79c4b51177b4d6 in git.cmake.org maintaining the difrence with the upstream patch minimal CCMAIL:neundorf@kde.org svn path=/trunk/KDE/kdelibs/; revision=1184513
2010-07-12- made kdelibs compile for winceAndreas Holzammer
- disabled some functionality for wince - changed some stuff to unicode functions svn path=/trunk/KDE/kdelibs/; revision=1149056
2010-05-30-some minor syncing with the Qt4 files from cmake:Alexander Neundorf
-use unset() now that we require cmake 2.6.4 -sync doc strings and line breaks Alex svn path=/trunk/KDE/kdelibs/; revision=1132356
2010-02-16Add the support of QtDeclarative module in Qt 4.7. Green flag inAlexis Ménard
kde-core-devel. svn path=/trunk/KDE/kdelibs/; revision=1091507
2010-01-18-comment debug outputAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1076822
2010-01-18-fix two remaining compat. issues found by the cmake devs:Alexander Neundorf
-- the imported targets did not work with Qt installed as frameworks on OSX -- if a project exported its libraries, and these libraries depend on Qt libs, but the installed FooConfig.cmake files do not load FindQt4.cmake, this would result in unknown targets "Qt4::QtCore" etc. So now there is a switch to enable the imported targets explicitely (what we do for KDE) Alex svn path=/trunk/KDE/kdelibs/; revision=1076819
2010-01-17-remove commented codeAlexander Neundorf
-add a comment that the name of the imported targets must not change Alex svn path=/trunk/KDE/kdelibs/; revision=1076155
2010-01-13-fix the temporary source incompatiblity introduced in rev 1070849Alexander Neundorf
(when a project first did a find_package(Qt4) with a FindQt4.cmake not from kdelibs, followed by a find_package(KDE4), the imported targets for the Qt library used in the exported targets file of kdelibs and created in kdelibs FindQt4.cmake did not exist, so it did not link) Now when doing a find_package(KDE4) always the FindQt4.cmake in the same directory is executed, and only does nothing if also the imported Qt targets already exist. This should fix rekonq, quassel, amarok, etc. Please let me know if it still does not work. Please also let me know if it works now. Thanks Alex CCMAIL: sputnick@quassel-irc.org CCMAIL: bbeschow@cs.tu-berlin.de svn path=/trunk/KDE/kdelibs/; revision=1074319
2010-01-06-introduce imported targets for the various Qt4 libraries, so we can handle ↵Alexander Neundorf
the release- and debug-libraries finally properly. Tested on my machine with Linux with kdelibs, kdeutils and some other module, and also tested under Windows by Saro. If you suddenly get strange linking-related errors with Qt4 libraries, please let me know ASAP. This should also help the installation of KDE under Windows, since with these imported Qt libraries the location of the Qt-libraries is not fixed at kdelibs-buildtime anymore (for the installed dependencies-file), but determined at 3rd-party cmake-time. So different locations of Qt on a Windows-development machine should be no problem anymore. (I'd like to have some feedback on this ) Alex CCMAIL: kde-windows@kde.org CCMAIL: kde-buildsystem@kde.org CCMAIL: <ps_ml@gmx.de> svn path=/trunk/KDE/kdelibs/; revision=1070849
2009-12-23-handle the case that release- as well as debug-version have been found ↵Alexander Neundorf
first, because otherwise we always run into this branch (because the release-only and debug-only branches set both variables) Alex svn path=/trunk/KDE/kdelibs/; revision=1065525
2009-12-20-sync the way how the libraries are found with the FindQt4.cmake from ↵Alexander Neundorf
current cmake With this commit there are only minor differences to the FindQt4.cmake coming with cmake left. Alex svn path=/trunk/KDE/kdelibs/; revision=1064318
2009-12-20-sort the libs alphabeticallyAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1064299
2009-12-20-sync with cmake: move the check for the window system before the ↵Alexander Neundorf
include-dir search Alex svn path=/trunk/KDE/kdelibs/; revision=1064296
2009-12-20-syncing with cmake: 7 differences less, 35 left to goAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1064278
2009-12-14-add the framework path to QT_INCLUDE_DIR instead of QT_QTCORE_INCLUDE_DIRAlexander Neundorf
Both are used always by UseQt4.cmake, and it is somewhat more logical to add it to QT_INCLUDE_DIR, since this is necessary when using Qt<Module>/foo.h includes, which is similar to the framework-style includes Alex CCMAIL: <mike@mikearthur.co.uk> Mike, can you please confirm this also work for you on OSX ? svn path=/trunk/KDE/kdelibs/; revision=1062473
2009-12-13-make building KDE with Qt4 installed as OSX frameworks workAlexander Neundorf
Alex CCMAIL: mike@mikearthur.co.uk CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=1062002
2009-12-01correct copy'n'paste errorPatrick Spendrin
svn path=/trunk/KDE/kdelibs/; revision=1057264
2009-11-24add QtMultimediaPatrick Spendrin
svn path=/trunk/KDE/kdelibs/; revision=1053711
2009-11-23keep in sync with cmake: search for linguist and designerAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1053371
2009-11-15-sync with cmake: move -DQT_DLL into Qt4ConfigDependentSettings.cmakeAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1049724
2009-11-15-more syncing with cmake: split some logic of FindQt4.cmake into separate ↵Alexander Neundorf
files Qt4Macros.cmake and Qt4ConfigDependentSettings.cmake, which are automatically included by FindQt4.cmake. -no functional changes Alex svn path=/trunk/KDE/kdelibs/; revision=1049722
2009-11-12-also search for qmake-mac, which is used as name for qmake by macports ↵Alexander Neundorf
(http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2) Alex svn path=/trunk/KDE/kdelibs/; revision=1048069
2009-11-12-remove commented out code for Apple, which was not necessary anymore (since ↵Alexander Neundorf
a long time probably) -nicer formatting for the MSVC detection stuff -no functional changes Alex svn path=/trunk/KDE/kdelibs/; revision=1048068
2009-11-10the special handling for Apple frameworks should not be necessary, this must ↵Alexander Neundorf
be a remnant from old cmake times, it's there since January 2006 (not sure cmake 2.4 was actually already released back then) Mac users: if this breaks finding Qt4 frameworks for you, please let me know Alex svn path=/trunk/KDE/kdelibs/; revision=1047264
2009-11-09-sync (and probably fix) the ActiveQt detection on WindowsAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1046868
2009-11-09-sort documentation entries betterAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1046787
2009-11-08-move the mark_as_advanced() to the end of the include-path-checking sectionAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1046474
2009-11-08-use QT_HEADERS_DIR instead of QT_INCLUDE_DIR now after mavong some calls aroundAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1046471
2009-11-08some more syncing with FindQt4.cmake from cmake:Alexander Neundorf
-use the same cmake code for finding the include dirs for the different Qt modules -move the mark_as_advanced() around a bit -fix the the -F flag for moc on OSX Alex svn path=/trunk/KDE/kdelibs/; revision=1046417
2009-11-08-some syncing with FindQt4.cmake from cmake: search for cluceneAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1046398
2009-11-05sync with cmake 2.8 version Patrick Spendrin
only windows specific stuff and adding QtScriptTools required for rocs svn path=/trunk/KDE/kdelibs/; revision=1045351
2009-10-03more syncing with cmake cvs: enforce refinding stuff if qmake has changedAlexander Neundorf
...only 50 differences left Alex svn path=/trunk/KDE/kdelibs/; revision=1030987
2009-10-03unset() exists since cmake 2.6.3, so it must not be used in KDEAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1030977
2009-10-03more syncing with cmake cvs: use the same code for handling mocAlexander Neundorf
This may result in the moc files placed in other directories as before. The only difference should be when including files, but I think it should be ok. Checked building kdelibs, no problems there. Let me know if there are suddenly moc-related problems. Alex CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=1030975
2009-10-03-more syncing with the version from cmake cvs: also pass the compile flags ↵Alexander Neundorf
to moc -pass -DWIN32 to moc under Windows -add internal macro QT4_MAKE_OUTPUT_FILE(), not used yet Alex svn path=/trunk/KDE/kdelibs/; revision=1030952
2009-10-01more sync: document QT_MAC_USE_COCOAAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1030207
2009-10-01-more synching with the file from cmake: support specifiying the minimum Qt ↵Alexander Neundorf
version in the find_package() call Alex svn path=/trunk/KDE/kdelibs/; revision=1030201
2009-10-01-some more syncing with the version from cmake:Alexander Neundorf
- add macros QT4_CREATE_TRANSLATION() and QT4_ADD_TRANSLATION() - figure out the QT_EDITION - check for QT_MAC_USE_COCOA Alex svn path=/trunk/KDE/kdelibs/; revision=1030195
2009-10-01-start synching with the FindQt4.cmake from current cmake cvs HEADAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=1030155
2009-08-18Fix detection of Qt's phonon, patch by Pavel Volkovitskiy, approved by Thiago.David Faure
This needs Qt-4.5.3 when it's out or kde-qt (which has the fix backported). For older versions of Qt, it didn't work before, and it still won't work; we used standalone phonon instead (and most people still do). svn path=/trunk/KDE/kdelibs/; revision=1013127
2009-08-17Use -o rather than > so that we don't get an empty file on error (e.g. ↵David Faure
"qdbuscpp2xml: could not execute moc") (empty file which itself will lead to a different error message next time) Can this be merged into cmake's FindQt4.cmake? Thanks. CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=1012421
2009-07-09Add Qt Webkit framework support.Mike Arthur
svn path=/trunk/KDE/kdelibs/; revision=993948
2009-07-09whoops - revert last change, this should not have gone inHarald Fernengel
svn path=/trunk/KDE/kdelibs/; revision=993915
2009-07-09enable QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATIONHarald Fernengel
svn path=/trunk/KDE/kdelibs/; revision=993910
2009-06-01Also serach for the QtHelp library when using frameworks.Andreas Pakulat
svn path=/trunk/KDE/kdelibs/; revision=976236
2009-05-28Support and document QT_VERSION_(MAJOR|MINOR|PATCH) as does FindQt4.cmake fromAndreas Pakulat
cmake-upstream. svn path=/trunk/KDE/kdelibs/; revision=974307
2008-10-13Did I miss the meaning of this message?Harri Porten
svn path=/trunk/KDE/kdelibs/; revision=871039
2008-08-26Allow a classname to be specified for QT_ADD_DBUS_INTERFACE, and document ↵Alex Merry
the possibility for setting a header to include. svn path=/trunk/KDE/kdelibs/; revision=852986
generated by cgit v1.2.1 (git 2.18.0) at 2025-12-30 19:32:49 +0000