From eb83c197896a44b2c4a5e950ef3d8b977fc35ce4 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Wed, 16 Dec 2009 17:16:59 -0500
Subject: [PATCH] -better support for Qt4 as frameworks

before this patch -F<framework> dir had to be added manually in some way
when using Qt4 installed as framework and when using FindQt4.cmake directly,
i.e. without UseQt4.cmake. With this patch the framework dir is
automatically added to QT_INCLUDE_DIR when Qt is installed as a framework.

Ok by Clinton, tested already in KDE by Mike Arthur.

Alex
---
 Modules/FindQt4.cmake | 11 ++++++++++-
 Modules/UseQt4.cmake  |  3 ---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 5a5a1b0341..289698e0b9 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -906,7 +906,16 @@ IF (QT4_QMAKE_FOUND)
     _QT4_ADJUST_LIB_VARS(QAXSERVER)
     _QT4_ADJUST_LIB_VARS(QAXCONTAINER)
   ENDIF(WIN32)
-  
+
+  # If Qt is installed as a framework, we need to add QT_QTCORE_LIBRARY here (which
+  # is the framework directory in that case), since this will make the cmake include_directories()
+  # command recognize that we need the framework flag with the respective directory (-F)
+  IF(QT_USE_FRAMEWORKS)
+    SET(QT_INCLUDES       ${QT_INCLUDES} ${QT_QTCORE_LIBRARY} )
+    SET(QT_INCLUDE_DIR ${QT_INCLUDE_DIR} ${QT_QTCORE_LIBRARY} )
+  ENDIF(QT_USE_FRAMEWORKS)
+
+
 
   #######################################
   #
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index 91920970f7..a18beaf86e 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -23,9 +23,6 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_
 SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
 
 INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
-IF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
-  INCLUDE_DIRECTORIES(${QT_QTCORE_LIBRARY})
-ENDIF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
 
 SET(QT_LIBRARIES "")