From b62c9ee93f3cec43145514d5fb9b76e1e43a6b0c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Jan 2010 22:31:01 +0000 Subject: -same as in trunk: -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=/branches/KDE/4.4/kdelibs/; revision=1076826 --- modules/FindKDE4Internal.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules/FindKDE4Internal.cmake') 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 -- cgit v1.2.1