I originally misposted this to kde-core-devel, but I guess it belongs here.

The attached patch applies to: kdelib/cmake/modules/FindQt4.cmake

This patch makes KDE4 kdelibs on MacOSX expect to get QtTest from a
Framework instead of a library.

This allowed me to get kdelib and its components to all compile (and
run) under MacOSX 10.4 (with g++ 4.0.1) using trunk KDE SVN r577213
against the qt-mac-opensource-src-4.2.0-snapshot-20060825 snapshot when
it is combined with the qt-mac-20060824.patch I sent to the Trolltech
[EMAIL PROTECTED] list.  If you are interested in the Qt
patch it can be found at: http://kde.bunce.us/qt-mac-20060824.patch

Thanks and Enjoy,
Erik L. Bunce



Index: cmake/modules/FindQt4.cmake
===================================================================
--- cmake/modules/FindQt4.cmake	(revision 577213)
+++ cmake/modules/FindQt4.cmake	(working copy)
@@ -532,13 +532,13 @@
     SET(QT_QTSVG_LIBRARY_DEBUG        "-framework QtSvg"      CACHE STRING "The QtSvg library.")
     SET(QT_QTDBUS_LIBRARY_RELEASE     "-framework QtDBus"     CACHE STRING "The QtDBus library.")
     SET(QT_QTDBUS_LIBRARY_DEBUG       "-framework QtDBus"     CACHE STRING "The QtDBus library.")
+    SET(QT_QTDBUS_LIBRARY_RELEASE     "-framework QtTest"     CACHE STRING "The QtTest library.")
+    SET(QT_QTDBUS_LIBRARY_DEBUG       "-framework QtTest"     CACHE STRING "The QtTest library.")
 
 
     # WTF?  why don't we have frameworks?  :P
     SET(QT_QTUITOOLS_LIBRARY_RELEASE      "-L${QT_LIBRARY_DIR} -lQtUiTools"      CACHE STRING "The QtUiTools library.")
     SET(QT_QTUITOOLS_LIBRARY_DEBUG      "-L${QT_LIBRARY_DIR} -lQtUiTools"      CACHE STRING "The QtUiTools library.")
-    SET(QT_QTTEST_LIBRARY_RELEASE "-L${QT_LIBRARY_DIR} -lQtTest" CACHE STRING "The QtTest library.")
-    SET(QT_QTTEST_LIBRARY_DEBUG   "-L${QT_LIBRARY_DIR} -lQtTest_debug" CACHE STRING "The QtTest library.")
     MARK_AS_ADVANCED(QT_QT3SUPPORT_LIBRARY QT_QTGUI_LIBRARY )
 
   ELSE (QT_USE_FRAMEWORKS)

_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to