[Kde-bindings] KDE/kdebindings

[Cyrille Berger]

SVN commit 831351 by berger:

* remove some of the ENABLE_SOMETHING options, that have a WITH_package equivalent, just as we just discussed
* add a configure test for plasma

CCMAIL:kde-bindings at kde.org


 M  +7 -2      CMakeLists.txt  
 M  +13 -14    ruby/CMakeLists.txt  
 M  +8 -12     smoke/CMakeLists.txt  


--- trunk/KDE/kdebindings/CMakeLists.txt #831350:831351
@@ -5,8 +5,8 @@
 
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
-include (KDE4Defaults)
-include (MacroLibrary)
+include(KDE4Defaults)
+include(MacroLibrary)
 include(MacroOptionalDependPackage)
 include(MacroOptionalAddSubdirectory)
 
@@ -34,6 +34,11 @@
   macro_optional_find_package(Akonadi)
 endif(DEPEND_PACKAGE_Akonadi)
 
+# Look for Plasma
+set( PLASMA_FOUND "no" )
+macro_optional_find_package(Plasma)
+
+
 macro_optional_add_subdirectory(smoke)
 macro_optional_add_subdirectory(ruby)
 macro_optional_add_subdirectory(python)
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #831350:831351
@@ -13,14 +13,10 @@
 OPTION(ENABLE_QWT_RUBY "build Qwt" OFF)
 OPTION(ENABLE_SOPRANO_RUBY "build Soprano" OFF)
 
-OPTION(ENABLE_AKONADI_RUBY "build Akonadi" OFF)
 OPTION(ENABLE_KDEVPLATFORM_RUBY "build KDevPlatform" OFF)
 OPTION(ENABLE_KORUNDUM_RUBY "build Korundum" ON)
 OPTION(ENABLE_KHTML_RUBY "build KHTML" ON)
 OPTION(ENABLE_KTEXTEDITOR_RUBY "build KTextEditor" ON)
-OPTION(ENABLE_NEPOMUK_RUBY "build Nepomuk" OFF)
-OPTION(ENABLE_PLASMA_RUBY "build Plasma" OFF)
-OPTION(ENABLE_OKULAR_RUBY "build Okular" OFF)
 OPTION(ENABLE_SOLID_RUBY "build Solid" ON)
 
 SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITE_ARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
@@ -74,19 +70,22 @@
         add_subdirectory( qwt )
         set(QWT_ENABLED "yes")
     endif(ENABLE_QWT_RUBY)
-    if(ENABLE_SOPRANO_RUBY AND Soprano_FOUND)
+    
+    if(Soprano_FOUND)
         add_subdirectory( soprano )
         set(SOPRANO_ENABLED "yes")
-    endif(ENABLE_SOPRANO_RUBY AND Soprano_FOUND)
+    endif(Soprano_FOUND)
 
-    if(ENABLE_AKONADI_RUBY AND KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+    if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
         add_subdirectory( akonadi )
         set(AKONADI_ENABLED "yes")
-    endif(ENABLE_AKONADI_RUBY AND KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+    endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+    
     if(ENABLE_KORUNDUM_RUBY)
         add_subdirectory( korundum )
         set(KORUNDUM_ENABLED "yes")
     endif(ENABLE_KORUNDUM_RUBY)
+    
     if(ENABLE_KDEVPLATFORM_RUBY)
         add_subdirectory( kdevplatform )
         set(KDEVPLATFORM_ENABLED "yes")
@@ -99,18 +98,18 @@
         add_subdirectory( ktexteditor )
         set(KTEXTEDITOR_ENABLED "yes")
     endif(ENABLE_KTEXTEDITOR_RUBY)
-    if(ENABLE_NEPOMUK_RUBY AND Nepomuk_FOUND)
+    if(Nepomuk_FOUND)
         add_subdirectory( nepomuk )
         set(NEPOMUK_ENABLED "yes")
-    endif(ENABLE_NEPOMUK_RUBY AND Nepomuk_FOUND)
-    if(ENABLE_OKULAR_RUBY AND OKULAR_FOUND)
+    endif(Nepomuk_FOUND)
+    if(OKULAR_FOUND)
         add_subdirectory( okular )
         set(OKULAR_ENABLED "yes")
-    endif(ENABLE_OKULAR_RUBY AND OKULAR_FOUND)
-    if(ENABLE_PLASMA_RUBY)
+    endif(OKULAR_FOUND)
+    if(PLASMA_FOUND)
         add_subdirectory( plasma )
         set(PLASMA_ENABLED "yes")
-    endif(ENABLE_PLASMA_RUBY)
+    endif(PLASMA_FOUND)
     if(ENABLE_SOLID_RUBY)
         add_subdirectory( solid )
         set(SOLID_ENABLED "yes")
--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #831350:831351
@@ -5,14 +5,10 @@
 OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" ON)
 OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" ON)
 OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
-OPTION(ENABLE_SOPRANO_SMOKE "build SopranoSmoke" OFF)
-OPTION(ENABLE_AKONADI_SMOKE "build AkonadiSmoke" OFF)
-OPTION(ENABLE_PLASMA_SMOKE "build PlasmaSmoke" OFF)
 OPTION(ENABLE_KDE_SMOKE "build KDESmoke" ON)
 OPTION(ENABLE_KDEVPLATFORM_SMOKE "build KDevPlatformSmoke" OFF)
 OPTION(ENABLE_KHTML_SMOKE "build KHTMLSmoke" ON)
 OPTION(ENABLE_KTEXTEDITOR_SMOKE "build KTextEditorSmoke" ON)
-OPTION(ENABLE_NEPOMUK_SMOKE "build NepomukSmoke" OFF)
 OPTION(ENABLE_OKULAR_SMOKE "build OkularSmoke" OFF)
 OPTION(ENABLE_SOLID_SMOKE "build SolidSmoke" ON)
 
@@ -56,10 +52,10 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Solid")
     endif(ENABLE_SOLID_SMOKE)
 
-    if(ENABLE_SOPRANO_SMOKE AND Soprano_FOUND)
+    if(Soprano_FOUND)
         add_subdirectory(soprano)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Soprano")
-    endif(ENABLE_SOPRANO_SMOKE AND Soprano_FOUND)
+    endif(Soprano_FOUND)
 
     if(ENABLE_PLASMA_SMOKE)
         add_subdirectory(plasma)
@@ -71,10 +67,10 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDE")
     endif(ENABLE_KDE_SMOKE)
 
-    if(ENABLE_AKONADI_SMOKE AND KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+    if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
         add_subdirectory(akonadi)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
-    endif(ENABLE_AKONADI_SMOKE AND KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+    endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
 
     if(ENABLE_KDEVPLATFORM_SMOKE)
         add_subdirectory(kdevplatform)
@@ -91,15 +87,15 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
     endif(ENABLE_KTEXTEDITOR_SMOKE)
 
-    if(ENABLE_NEPOMUK_SMOKE AND Nepomuk_FOUND)
+    if(Nepomuk_FOUND)
         add_subdirectory(nepomuk)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
-    endif(ENABLE_NEPOMUK_SMOKE AND Nepomuk_FOUND)
+    endif(Nepomuk_FOUND)
 
-    if(ENABLE_OKULAR_SMOKE AND OKULAR_FOUND)
+    if(OKULAR_FOUND)
         add_subdirectory(okular)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
-    endif(ENABLE_OKULAR_SMOKE AND OKULAR_FOUND)
+    endif(OKULAR_FOUND)
 
 endif(ENABLE_SMOKE)