[Kde-bindings] KDE/kdebindings/smoke

Richard Dale Richard_Dale at tipitina.demon.co.uk
Sat May 31 15:12:58 UTC 2008


SVN commit 814878 by rdale:

* Add an Okular smoke lib and split off the QtUiTools module into its own smoke lib as
  it is linked to a large static library

CCMAIL: kde-bindings at kde.org

 M  +18 -5     CMakeLists.txt  
 A             okular (directory)  
 A             okular/CMakeLists.txt  
 A             okular/classlist  
 A             okular/generate.pl.cmake  
 A             okular/header_list  
 A             okular/hint_header_list.pl  
 A             okular/kde_header_list  
 A             okular/okular_header_list  
 A             okular/okular_smoke.h   [License: UNKNOWN]
 M  +0 -2      qt/CMakeLists.txt  
 M  +0 -1      qt/header_list  
 D             qt/qscintilla2_header_list  
 D             qt/qscintilla_header_list  
 D             qt/qwt_header_list  
 A             qtuitools (directory)  
 A             qtuitools/CMakeLists.txt  
 A             qtuitools/classlist  
 A             qtuitools/generate.pl.cmake  
 A             qtuitools/header_list  
 A             qtuitools/hint_header_list.pl  
 A             qtuitools/qtuitools_header_list  
 A             qtuitools/qtuitools_smoke.h   [License: UNKNOWN]


--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #814877:814878
@@ -1,18 +1,26 @@
 FIND_PACKAGE(QScintilla)
+
 OPTION(ENABLE_SMOKE "build Smoke" ON)
-OPTION(ENABLE_SMOKEQSCI "build SmokeQsci" ON)
+OPTION(ENABLE_SMOKEQTUITOOLS "build SmokeQtUiTools" ON)
+OPTION(ENABLE_SMOKEQSCI "build SmokeQsci" OFF)
 OPTION(ENABLE_SMOKEQWT "build SmokeQwt" OFF)
-OPTION(ENABLE_SMOKESOPRANO "build SmokeSoprano" ON)
+OPTION(ENABLE_SMOKESOPRANO "build SmokeSoprano" OFF)
 OPTION(ENABLE_SMOKEPLASMA "build SmokePlasma" OFF)
 OPTION(ENABLE_SMOKEKDE "build SmokeKDE" ON)
-OPTION(ENABLE_SMOKEAKONADI "build SmokeAkonadi" ON)
+OPTION(ENABLE_SMOKEAKONADI "build SmokeAkonadi" OFF)
 OPTION(ENABLE_SMOKEKHTML "build SmokeKHTML" ON)
+OPTION(ENABLE_SMOKEOKULAR "build SmokeOkular" OFF)
 
 set(SMOKE_ENABLED "no")
-if(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI OR ENABLE_SMOKEKHTML)
+if(ENABLE_SMOKE)
     add_subdirectory(qt)
     set(SMOKE_ENABLED "yes - Qt")
 
+    if(ENABLE_SMOKEQTUITOOLS)
+        add_subdirectory(qtuitools)
+        set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtUiTools")
+    endif(ENABLE_SMOKEQTUITOOLS)
+
     if(ENABLE_SMOKEQSCI)
         if( QSCINTILLA_FOUND)
            add_subdirectory(qsci)
@@ -52,8 +60,13 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
     endif(ENABLE_SMOKEKHTML)
 
-endif(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI OR ENABLE_SMOKEKHTML)
+    if(ENABLE_SMOKEOKULAR)
+        add_subdirectory(okular)
+        set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
+    endif(ENABLE_SMOKEOKULAR)
 
+endif(ENABLE_SMOKE)
+
 # for qtguess.pl
 if (APPLE)
 set(qt_test_threshold 15)
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #814877:814878
@@ -135,10 +135,8 @@
                               ${QT_QTDBUS_LIBRARY}
                               ${QT_QTSQL_LIBRARY}
                               ${QT_QTSVG_LIBRARY}
-                              ${QT_QTUITOOLS_LIBRARY}
                               ${QT_QTXML_LIBRARY}
                               ${QT_QTWEBKIT_LIBRARY} )
-#                              ${_smokeqt_optional_libs} )
 
 set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
--- trunk/KDE/kdebindings/smoke/qt/header_list #814877:814878
@@ -312,7 +312,6 @@
 qgraphicssvgitem.h
 qsvgrenderer.h
 qsvgwidget.h
-quiloader.h
 qdom.h
 qxml.h
 qdbusabstractadaptor.h



More information about the Kde-bindings mailing list