From 7706d8316d876760f708e9608c69376ecd6f8223 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 3 Jan 2007 22:31:02 +0000 Subject: partly sync with cmake cvs: search QtCore inc dir only in the dir qmake reported Alex svn path=/trunk/KDE/kdelibs/; revision=619645 --- modules/FindQt4.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 37a8314c..220a9b46 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -329,12 +329,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_HEADERS_DIR}/QtCore ${QT_LIBRARY_DIR}/QtCore.framework/Headers - $ENV{QTDIR}/include/QtCore - "$ENV{ProgramFiles}/qt/include/Qt" - ) + NO_DEFAULT_PATH + ) # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR} IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) -- cgit v1.2.1