From 1720f0ae036c00a5e5722b0e0fe8ad4074e3b395 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 20 Mar 2006 11:11:23 +0000 Subject: first try the include dir from qmake, and only use /usr/local/Trolltech/Qt-4*/include/Qt/ after the QTDIR environment variable (before cmake always picked up /usr/local/Trolltech/Qt-4.0.1/...) svn path=/trunk/KDE/kdelibs/; revision=520562 --- modules/FindQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 96db6164..533e1ed1 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -206,10 +206,10 @@ if(QT4_QMAKE_FOUND) FIND_PATH( QT_QTCORE_INCLUDE_DIR QtGlobal "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/QtCore" - ${QT_PATH_INCLUDE} ${QT_HEADERS_DIR}/QtCore ${QT_LIBRARY_DIR}/QtCore.framework/Headers $ENV{QTDIR}/include/QtCore + ${QT_PATH_INCLUDE} /usr/local/qt/include/QtCore /usr/local/include/QtCore /usr/lib/qt/include/QtCore -- cgit v1.2.1