aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2009-11-08 20:34:35 +0000
committerAlexander Neundorf <neundorf@kde.org>2009-11-08 20:34:35 +0000
commit733a697345a7b25185d4ce1e5228da83a8f54245 (patch)
tree36dc16608dc37c47d6f5f523e6469c65f00fe658 /modules
parent0b44a7baaa68cf9a620f942874e9e594f7ad4048 (diff)
downloadextra-cmake-modules-733a697345a7b25185d4ce1e5228da83a8f54245.tar.gz
extra-cmake-modules-733a697345a7b25185d4ce1e5228da83a8f54245.tar.bz2
-use QT_HEADERS_DIR instead of QT_INCLUDE_DIR now after mavong some calls around
Alex svn path=/trunk/KDE/kdelibs/; revision=1046471
Diffstat (limited to 'modules')
-rw-r--r--modules/FindQt4.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 1ce79201..92df1def 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -646,7 +646,6 @@ IF (QT4_QMAKE_FOUND)
# Set QT_QTAXSERVER_INCLUDE_DIR
FIND_PATH(QT_QTAXSERVER_INCLUDE_DIR QtAxServer
PATHS
- ${QT_INCLUDE_DIR}/QtAxServer
${QT_HEADERS_DIR}/QtAxServer
NO_DEFAULT_PATH
)
@@ -654,7 +653,6 @@ IF (QT4_QMAKE_FOUND)
# Set QT_QTAXCONTAINER_INCLUDE_DIR
FIND_PATH(QT_QTAXCONTAINER_INCLUDE_DIR QtAxContainer
PATHS
- ${QT_INCLUDE_DIR}/QtAxContainer
${QT_HEADERS_DIR}/QtAxContainer
NO_DEFAULT_PATH
)
@@ -687,7 +685,7 @@ IF (QT4_QMAKE_FOUND)
# Set QT_QT_INCLUDE_DIR
FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
PATHS
- ${QT_INCLUDE_DIR}/Qt
+ ${QT_HEADERS_DIR}/Qt
${QT_LIBRARY_DIR}/QtCore.framework/Headers
NO_DEFAULT_PATH
)