From 7125c6eb7164a8ab94f829094ff92c948722415e Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sat, 1 Apr 2006 12:11:08 +0000
Subject: add QT_MKSPECS_DIR

svn path=/trunk/KDE/kdelibs/; revision=525241
---
 modules/FindQt4.cmake | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 2d585c25..d137c1d8 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -136,6 +136,7 @@
 #  QT_RCC_EXECUTABLE          Where to find the rcc tool
 #
 #  QT_DOC_DIR                 Path to "doc" of Qt4
+#  QT_MKSPECS_DIR             Path to "mkspecs" of Qt4
 #
 #
 # These are around for backwards compatibility
@@ -263,6 +264,14 @@ IF (QT4_QMAKE_FOUND)
     SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
   ENDIF (NOT QT_DOC_DIR)
 
+  # ask qmake for the mkspecs directory
+  IF (NOT QT_MKSPECS_DIR)
+    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+      ARGS "-query QMAKE_MKSPECS"
+      OUTPUT_VARIABLE qt_mkspecs_dir )
+    SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
+  ENDIF (NOT QT_MKSPECS_DIR)
+
   ########################################
   #
   #       Setting the INCLUDE-Variables
@@ -401,7 +410,7 @@ IF (QT4_QMAKE_FOUND)
   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR)
 
   # Set QT_INCLUDES
-  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} )
+  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
 
 
   ########################################
-- 
cgit v1.2.1