[Kde-bindings] KDE/kdebindings

[Thomas Moenicke]

SVN commit 630307 by moenicke:

* Removed KDE depencies from cmake in smokeqt
* added cmake support for QScintilla v2 in smokeqt

CCMAIL: kde-bindings at kde.org



 A             cmake/modules/FindQScintilla.cmake  
 M  +9 -4      smoke/qt/CMakeLists.txt  
 M  +3 -3      smoke/qt/generate.pl.cmake  
 A             smoke/qt/qscintilla2_header_list  


--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #630306:630307
@@ -1,6 +1,12 @@
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+include(FindQScintilla)
 
+include_directories( ${QT_INCLUDES}  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+
+if(QSCINTILLA_FOUND)
+    include_directories( ${QSCINTILLA_INCLUDE_DIR} )
+endif(QSCINTILLA_FOUND)
+
 # for qtguess.pl
 set(qt_test_threshold 10)
 set(qtflags "-lQtCore -lQtGui")
@@ -71,11 +77,10 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
 )
 
-kde4_automoc(${smokeqt_LIB_SRCS})
-
 kde4_add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
+# add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
 
-target_link_libraries(smokeqt  ${KDE4_KDECORE_LIBS} QtNetwork QtSql QtOpenGL QtXml QtSvg QtUiTools )
+target_link_libraries(smokeqt ${QT_QTCORE_LIBRARY} QtSvg QtGui QtNetwork QtSql QtOpenGL QtXml QtUiTools ${QSCINTILLA2_LIBRARIES} )
 
 set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokeqt DESTINATION ${LIB_INSTALL_DIR} )
--- trunk/KDE/kdebindings/smoke/qt/generate.pl.cmake #630306:630307
@@ -25,19 +25,19 @@
 
 if("@QSCINTILLA_FOUND@" eq "YES")
 {
- $qscintilla_headerlist = "./qscintilla_header_list";
+ $qscintilla_headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/qscintilla2_header_list";
  $qscintilla_headerlistpath = "$here/$qscintilla_headerlist";
 }
 
 if("@QT_DBUS_FOUND@" eq "YES")
 {
- $qtdbus_headerlist = "./qtdbus_header_list";
+ $qtdbus_headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/qtdbus_header_list";
  $qtdbus_headerlistpath = "$here/$qtdbus_headerlist";
 }
 
 if("@QWT_FOUND@" eq "YES")
 {
- $qwt_headerlist = "./qwt_header_list";
+ $qwt_headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/qwt_header_list";
  $qwt_headerlistpath = "$here/$qwt_headerlist";
 }