diff options
| author | Matthias Kretz <kretz@kde.org> | 2006-03-20 11:11:23 +0000 |
|---|---|---|
| committer | Matthias Kretz <kretz@kde.org> | 2006-03-20 11:11:23 +0000 |
| commit | 1720f0ae036c00a5e5722b0e0fe8ad4074e3b395 (patch) | |
| tree | 733556c14467d93fb756c16f917b5a7079384d4a | |
| parent | 13e0a7dab6a997b0cb87c823cfb084f1ded269d2 (diff) | |
| download | extra-cmake-modules-1720f0ae036c00a5e5722b0e0fe8ad4074e3b395.tar.gz extra-cmake-modules-1720f0ae036c00a5e5722b0e0fe8ad4074e3b395.tar.bz2 | |
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
| -rw-r--r-- | modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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 |