[Kde-bindings] KDE/kdebindings

[Andreas Pakulat]

SVN commit 725166 by apaku:

Improve the finding of QScintilla a bit and also the handling of Qwt and QScintilla in smoke.
CCMAIL: kde-bindings at kde.org


 M  +4 -4      cmake/modules/FindQScintilla.cmake  
 M  +10 -3     smoke/qt/CMakeLists.txt  


--- trunk/KDE/kdebindings/cmake/modules/FindQScintilla.cmake #725165:725166
@@ -14,7 +14,7 @@
     INCLUDE(FindQt4)
 ENDIF(NOT QT4_FOUND)
 
-SET(QSCINTILLA_FOUND "NO")
+SET(QSCINTILLA_FOUND FALSE)
 
 IF(QT4_FOUND)
     FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
@@ -27,10 +27,10 @@
         PATHS ${QT_LIBRARY_DIR}
     )
 
-    IF (QSCINTILLA_LIBRARY)
+    IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
 
         SET(QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY})
-        SET(QSCINTILLA_FOUND "YES")
+        SET(QSCINTILLA_FOUND TRUE)
 
         IF (CYGWIN)
             IF(BUILD_SHARED_LIBS)
@@ -40,7 +40,7 @@
             ENDIF(BUILD_SHARED_LIBS)
         ENDIF (CYGWIN)
 
-    ENDIF (QSCINTILLA_LIBRARY)
+    ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
 ENDIF(QT4_FOUND)
 
 IF (QSCINTILLA_FOUND)
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #725165:725166
@@ -4,12 +4,21 @@
 
 include_directories( ${QT_INCLUDES}  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
 
+set(_smokeqt_optional_libs)
 if(QSCINTILLA_FOUND)
+    message(STATUS "Including QScintilla support into smokeqt")
     include_directories( ${QSCINTILLA_INCLUDE_DIR} )
+    set(_smokeqt_optional_libs ${_smokeqt_optional_libs} ${QSCINTILLA_LIBRARIES})
+else(QSCINTILLA_FOUND)
+    message(STATUS "QScintilla not found, support disabled")
 endif(QSCINTILLA_FOUND)
 
 if(Qwt5_Qt4_FOUND)
+    message(STATUS "Including Qwt5 support into smokeqt")
     include_directories( ${Qwt5_INCLUDE_DIR} )
+    set(_smokeqt_optional_libs ${_smokeqt_optional_libs} ${Qwt5_Qt4_LIBRARY})
+else(Qwt5_Qt4_FOUND)
+    message(STATUS "Qwt5 not found, support disabled")
 endif(Qwt5_Qt4_FOUND)
 
 IF(NOT PERL_FOUND)
@@ -110,7 +119,6 @@
     set(all_libs "${libname} ${all_libs}")
 ENDFOREACH(libname)
 
-
 target_link_libraries(smokeqt ${QT_QTCORE_LIBRARY}
                               ${QT_QTGUI_LIBRARY}
                               ${QT_QTNETWORK_LIBRARY}
@@ -120,8 +128,7 @@
                               ${QT_QTSVG_LIBRARY}
                               ${QT_QTUITOOLS_LIBRARY}
                               ${QT_QTXML_LIBRARY}
-                              ${QSCINTILLA_LIBRARIES} 
-                              ${Qwt5_Qt4_LIBRARY} )
+                              ${_smokeqt_optional_libs} )
 
 set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )