diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-01-18 22:12:36 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-01-18 22:12:36 +0000 |
| commit | 4a956a832abbb1971d41375328bf71dad27a03f1 (patch) | |
| tree | 35b00050aa2ba29299f57ea73276782298b61674 /modules/FindKDE4Internal.cmake | |
| parent | d1b7b8459f383c215f1e70d305beab8dfb1a0aa5 (diff) | |
| download | extra-cmake-modules-4a956a832abbb1971d41375328bf71dad27a03f1.tar.gz extra-cmake-modules-4a956a832abbb1971d41375328bf71dad27a03f1.tar.bz2 | |
-fix two remaining compat. issues found by the cmake devs:
-- 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
Diffstat (limited to 'modules/FindKDE4Internal.cmake')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 569776a6..1ce3a7cb 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -337,6 +337,10 @@ if( ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) set(QT_MIN_VERSION "4.5.0") endif( ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) +# Tell FindQt4.cmake to point the QT_QTFOO_LIBRARY targets at the imported targets +# for the Qt libraries, so we get full handling of release and debug versions of the +# Qt libs and are flexible regarding the install location of Qt under Windows: +set(QT_USE_IMPORTED_TARGETS TRUE) #this line includes FindQt4.cmake, which searches the Qt library and headers # TODO: we should check here that all necessary modules of Qt have been found, e.g. QtDBus |