From af0e749d1b7be7b28556ee14ca9fba6ec387e33b Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Sat, 28 Jan 2006 22:04:49 +0000 Subject: work around some kjs stuff that assumes __APPLE__ == WEBKIT, also fix definitions for QT_AND_KDECORE_LIBS to get -L and -F svn path=/trunk/KDE/kdelibs/; revision=503366 --- modules/FindKDE4.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 77a407db..66d840d2 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -29,7 +29,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.2) IF(UNIX) IF(APPLE) - #MESSAGE(FATAL_ERROR "Mac OSX not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required") + SET(PLATFORM_DEFINITIONS -D__APPLE_KDE__) ELSE(APPLE) FIND_PACKAGE(X11 REQUIRED) ENDIF(APPLE) @@ -40,11 +40,11 @@ ENDIF(UNIX) #this line includes FindQt.cmake, which searches the Qt library and headers FIND_PACKAGE(Qt4 REQUIRED) -SET(QT_AND_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) +SET(QT_AND_KDECORE_LIBS ${QT_DEFINITIONS} ${QT_QTCORE_LIBRARY} kdecore) #add some KDE specific stuff # not used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT -SET(KDE4_DEFINITIONS -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -DQT_NO_TRANSLATION -D_REENTRANT ) +SET(KDE4_DEFINITIONS -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -DQT_NO_TRANSLATION -D_REENTRANT ${PLATFORM_DEFINITIONS} ) #only on linux, but not e.g. on FreeBSD: -- cgit v1.2.1