---------- Forwarded Message ----------
Subject: kdelibs/cmake/modules patches
Date: Monday 28 January 2008
From: David Johnson <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
At the kde-freebsd team, we have make some simple patches to fix some linkage
errors, that will sometimes link to KDE3/Qt3 instead of KDE4/Qt4. These
patches work on FreeBSD, and have been tested on Linux (Arch) as well. We
would like to get these into the upstream. Can you look these over and check
their appropriateness? If okay I can check them into 4.0 and trunk.
Thanks,
--
David Johnson
-------------------------------------------------------
--- ../cmake/modules/FindKDE4Internal.cmake.orig 2008-01-27 16:28:59.000000000 +0000
+++ ../cmake/modules/FindKDE4Internal.cmake 2008-01-27 16:31:07.000000000 +0000
@@ -1024,7 +1024,7 @@
#add the found Qt and KDE include directories to the current include path
#the ${KDE4_INCLUDE_DIR}/KDE directory is for forwarding includes, eg. #include <KMainWindow>
-set(KDE4_INCLUDES ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} )
+set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ${QT_INCLUDES} )
set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS )
--- ../cmake/modules/FindQt4.cmake.orig 2008-01-19 17:19:17.000000000 +0100
+++ ../cmake/modules/FindQt4.cmake 2008-01-19 17:19:19.000000000 +0100
@@ -604,7 +604,7 @@
MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
# Set QT_INCLUDES
- SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
+ SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR})
########################################
@@ -833,7 +833,7 @@
IF (QT_${basename}_INCLUDE_DIR)
#add the include directory to QT_INCLUDES
- SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
+ SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
ENDIF (QT_${basename}_INCLUDE_DIR)
# Make variables changeble to the advanced user
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
