Fix compilation of kdesvn

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230400 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 27 insertions, 17 deletions

diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake
index e36dab4..16edaed 100644
--- a/cmakemodules/FindKdeLibs.cmake
+++ b/cmakemodules/FindKdeLibs.cmake
@@ -100,6 +100,7 @@ FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config
    $ENV{KDEDIR}/bin
    PATHS
   /opt/kde3/bin
+  /opt/trinity/bin
   /opt/kde/bin
   /usr/kde3/bin
   )
@@ -122,19 +123,20 @@ ENDIF(KDECONFIG_EXECUTABLE)
 
 # at first the KDE include direcory
 # kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
-# FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
-#  HINTS
-#  $ENV{KDEDIR}/include
-#  ${KDE3PREFIX}/include
-#  PATHS
-#  /opt/kde3/include
-#  /opt/kde/include
-#  /usr/include/kde
-#  /usr/local/include/kde
-#  )
+FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
+  HINTS
+  $ENV{KDEDIR}/include
+  ${KDE3PREFIX}/include
+  PATHS
+  /opt/kde3/include
+  /opt/trinity/include
+  /opt/kde/include
+  /usr/include/kde
+  /usr/local/include/kde
+)
 
 # override this
-SET(KDE3_INCLUDE_DIR "/usr/include/kde")
+# SET(KDE3_INCLUDE_DIR "/usr/include/kde")
 
 #now the KDE library directory
 FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
@@ -143,6 +145,7 @@ FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
   ${KDE3PREFIX}/lib
   PATHS
   /opt/kde3/lib
+  /opt/trinity/lib
   /opt/kde/lib
   /usr/kde3/lib
 )
@@ -166,6 +169,7 @@ FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl
   ${KDE3PREFIX}/bin
   PATHS
   /opt/kde3/bin
+  /opt/trinity/bin
   /opt/kde/bin
   /usr/kde3/bin
   )
@@ -176,6 +180,7 @@ FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
   ${KDE3PREFIX}/bin
   PATHS
   /opt/kde3/bin
+  /opt/trinity/bin
   /opt/kde/bin
   /usr/kde3/bin
   )
@@ -186,6 +191,7 @@ FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
   ${KDE3PREFIX}/bin
   PATHS
   /opt/kde3/bin
+  /opt/trinity/bin
   /opt/kde/bin
   /usr/kde3/bin
   )
@@ -218,20 +224,20 @@ IF(KDE3_FOUND)
    #only on linux, but NOT e.g. on FreeBSD:
    IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_USE_FLAGS)
       SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
-      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
+      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -I/usr/include/tqt -include tqt.h -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
    ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_USE_FLAGS)
 
    # works on FreeBSD, NOT tested on NetBSD and OpenBSD
    IF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_USE_FLAGS)
-      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -I/usr/include/tqt -include tqt.h -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
    ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_USE_FLAGS)
 
    # if no special buildtype is selected, add -O2 as default optimization
    IF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
-      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
-      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+      SET ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -I/usr/include/tqt -include tqt.h -O2")
+      SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -O2")
    ENDIF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
 
 #SET(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
@@ -307,6 +313,7 @@ SET(LIB_SEARCH_PATHES   ${KDE3_LIB_DIR}
   $ENV{KDEDIR}/lib
   /opt/kde/lib
   /opt/kde3/lib
+  /opt/trinity/lib
   /usr/lib
   /usr/local/lib
   /usr/kde3/lib
@@ -317,6 +324,7 @@ IF (LIB_SUFFIX)
         $ENV{KDEDIR}/lib${LIB_SUFFIX}
         /opt/kde/lib${LIB_SUFFIX}
         /opt/kde3/lib${LIB_SUFFIX}
+        /opt/trinity/lib${LIB_SUFFIX}
         /usr/lib${LIB_SUFFIX}
         /usr/local/lib${LIB_SUFFIX}
         ${LIB_SEARCH_PATHES})
@@ -356,6 +364,7 @@ FIND_PROGRAM(KDE3_KDECONFIG_EXECUTABLE NAME kde-config PATHS
     $ENV{KDEDIR}/bin
     /opt/kde/bin
     /opt/kde3/bin
+    /opt/trinity/bin
     /usr/kde3/bin
 )
 
@@ -370,6 +379,7 @@ FIND_PROGRAM(KDE3_MEINPROC_EXECUTABLE NAME meinproc PATHS
      $ENV{KDEDIR}/bin
      /opt/kde/bin
      /opt/kde3/bin
+     /opt/trinity/bin
      /usr/kde3/bin
 )