[Kde-bindings] KDE/kdebindings

Richard Dale Richard_Dale at tipitina.demon.co.uk
Sun Jun 22 16:57:37 UTC 2008


SVN commit 823148 by rdale:

* Try to make the naming of the cmake build options more consistent between smoke, ruby and
  csharp projects

CCMAIL: kde-bindings at kde.org

 M  +6 -6      csharp/CMakeLists.txt  
 M  +59 -59    ruby/CMakeLists.txt  
 M  +45 -45    smoke/CMakeLists.txt  


--- trunk/KDE/kdebindings/csharp/CMakeLists.txt #823147:823148
@@ -1,9 +1,9 @@
 OPTION(ENABLE_QYOTO "build Qyoto" ON)
 OPTION(ENABLE_QSCINTILLA_SHARP "build QScintillaSharp" OFF)
-OPTION(ENABLE_SOPRANO_SHARP "build SopranoSharp" OFF)
-OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" OFF)
+OPTION(ENABLE_SOPRANO_SHARP "build SopranoSharp" ON)
+OPTION(ENABLE_PLASMA_SHARP "build PlasmaSharp" ON)
 OPTION(ENABLE_KIMONO "build Kimono" ON)
-OPTION(ENABLE_KHTML "build KHTML" ON)
+OPTION(ENABLE_KHTML_SHARP "build KHTML" ON)
 
 set(QYOTO_ENABLED "no")
 
@@ -69,18 +69,18 @@
 	ADD_SUBDIRECTORY(kimono)
 ENDIF(ENABLE_KIMONO)
 
-IF(ENABLE_KHTML)
+IF(ENABLE_KHTML_SHARP)
 	IF (NOT QYOTO_ENABLED)
 		MESSAGE(FATAL_ERROR "Qyoto is needed for KHTML. You either didn't enable it or some of its dependencies aren't met.")
 	ENDIF (NOT QYOTO_ENABLED)
 	
 	SET(KHTML_ENABLED "yes")
 	ADD_SUBDIRECTORY(khtml)
-ENDIF(ENABLE_KHTML)
+ENDIF(ENABLE_KHTML_SHARP)
 
 message(STATUS "Build Qyoto... " ${QYOTO_ENABLED})
 message(STATUS "Build QScintillaSharp... " ${QSCINTILLA_SHARP_ENABLED})
 message(STATUS "Build SopranoSharp... " ${SOPRANO_SHARP_ENABLED})
 message(STATUS "Build PlasmaSharp... " ${PLASMA_SHARP_ENABLED})
 message(STATUS "Build Kimono... " ${KIMONO_ENABLED})
-message(STATUS "Build KHTML... " ${KHTML_ENABLED})
+message(STATUS "Build KHTMLSharp... " ${KHTML_ENABLED})
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #823147:823148
@@ -4,23 +4,23 @@
 # QtRuby/Korundum
 
 OPTION(ENABLE_QTRUBY "build QtRuby" ON)
-OPTION(ENABLE_QTWEBKIT "build QtWebKit" ON)
-OPTION(ENABLE_QTUITOOLS "build QtUiTools" ON)
+OPTION(ENABLE_QTWEBKIT_RUBY "build QtWebKit" ON)
+OPTION(ENABLE_QTUITOOLS_RUBY "build QtUiTools" ON)
 
-OPTION(ENABLE_PHONON "build Phonon" ON)
-OPTION(ENABLE_QSCINTILLA "build QScintilla" OFF)
-OPTION(ENABLE_QWT "build Qwt" OFF)
-OPTION(ENABLE_SOPRANO "build Soprano" OFF)
+OPTION(ENABLE_PHONON_RUBY "build Phonon" ON)
+OPTION(ENABLE_QSCINTILLA_RUBY "build QScintilla" OFF)
+OPTION(ENABLE_QWT_RUBY "build Qwt" OFF)
+OPTION(ENABLE_SOPRANO_RUBY "build Soprano" OFF)
 
-OPTION(ENABLE_AKONADI "build Akonadi" OFF)
-OPTION(ENABLE_KDEVPLATFORM "build KDevPlatform" OFF)
-OPTION(ENABLE_KORUNDUM "build Korundum" ON)
-OPTION(ENABLE_KHTML "build KHTML" ON)
-OPTION(ENABLE_KTEXTEDITOR "build KTextEditor" ON)
-OPTION(ENABLE_NEPOMUK "build Nepomuk" OFF)
-OPTION(ENABLE_PLASMA "build Plasma" OFF)
-OPTION(ENABLE_OKULAR "build Okular" ON)
-OPTION(ENABLE_SOLID "build Solid" ON)
+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" ON)
+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" )
 SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITE_LIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
@@ -47,88 +47,88 @@
         add_subdirectory( qtruby )
         set(QTRUBY_ENABLED "yes")
     endif(ENABLE_QTRUBY)
-    if(ENABLE_QTWEBKIT)
+    if(ENABLE_QTWEBKIT_RUBY)
         add_subdirectory( qtwebkit )
         set(QTWEBKIT_ENABLED "yes")
-    endif(ENABLE_QTWEBKIT)
-    if(ENABLE_QTUITOOLS)
+    endif(ENABLE_QTWEBKIT_RUBY)
+    if(ENABLE_QTUITOOLS_RUBY)
         add_subdirectory( qtuitools )
         set(QTUITOOLS_ENABLED "yes")
-    endif(ENABLE_QTUITOOLS)
+    endif(ENABLE_QTUITOOLS_RUBY)
 
-    if(ENABLE_PHONON)
+    if(ENABLE_PHONON_RUBY)
         add_subdirectory( phonon )
         set(PHONON_ENABLED "yes")
-    endif(ENABLE_PHONON)
-    if(ENABLE_QSCINTILLA)
+    endif(ENABLE_PHONON_RUBY)
+    if(ENABLE_QSCINTILLA_RUBY)
         add_subdirectory( qscintilla )
         set(QSCINTILLA_ENABLED "yes")
-    endif(ENABLE_QSCINTILLA)
-    if(ENABLE_QWT)
+    endif(ENABLE_QSCINTILLA_RUBY)
+    if(ENABLE_QWT_RUBY)
         add_subdirectory( qwt )
         set(QWT_ENABLED "yes")
-    endif(ENABLE_QWT)
-    if(ENABLE_SOPRANO)
+    endif(ENABLE_QWT_RUBY)
+    if(ENABLE_SOPRANO_RUBY)
         add_subdirectory( soprano )
         set(SOPRANO_ENABLED "yes")
-    endif(ENABLE_SOPRANO)
+    endif(ENABLE_SOPRANO_RUBY)
 
-    if(ENABLE_AKONADI)
+    if(ENABLE_AKONADI_RUBY)
         add_subdirectory( akonadi )
         set(AKONADI_ENABLED "yes")
-    endif(ENABLE_AKONADI)
-    if(ENABLE_KORUNDUM)
+    endif(ENABLE_AKONADI_RUBY)
+    if(ENABLE_KORUNDUM_RUBY)
         add_subdirectory( korundum )
         set(KORUNDUM_ENABLED "yes")
-    endif(ENABLE_KORUNDUM)
-    if(ENABLE_KDEVPLATFORM)
+    endif(ENABLE_KORUNDUM_RUBY)
+    if(ENABLE_KDEVPLATFORM_RUBY)
         add_subdirectory( kdevplatform )
         set(KDEVPLATFORM_ENABLED "yes")
-    endif(ENABLE_KDEVPLATFORM)
-    if(ENABLE_KHTML)
+    endif(ENABLE_KDEVPLATFORM_RUBY)
+    if(ENABLE_KHTML_RUBY)
         add_subdirectory( khtml )
         set(KHTML_ENABLED "yes")
-    endif(ENABLE_KHTML)
-    if(ENABLE_KTEXTEDITOR)
+    endif(ENABLE_KHTML_RUBY)
+    if(ENABLE_KTEXTEDITOR_RUBY)
         add_subdirectory( ktexteditor )
         set(KTEXTEDITOR_ENABLED "yes")
-    endif(ENABLE_KTEXTEDITOR)
-    if(ENABLE_NEPOMUK)
+    endif(ENABLE_KTEXTEDITOR_RUBY)
+    if(ENABLE_NEPOMUK_RUBY)
         add_subdirectory( nepomuk )
         set(NEPOMUK_ENABLED "yes")
-    endif(ENABLE_NEPOMUK)
-    if(ENABLE_OKULAR)
+    endif(ENABLE_NEPOMUK_RUBY)
+    if(ENABLE_OKULAR_RUBY)
         add_subdirectory( okular )
         set(OKULAR_ENABLED "yes")
-    endif(ENABLE_OKULAR)
-    if(ENABLE_PLASMA)
+    endif(ENABLE_OKULAR_RUBY)
+    if(ENABLE_PLASMA_RUBY)
         add_subdirectory( plasma )
         set(PLASMA_ENABLED "yes")
-    endif(ENABLE_PLASMA)
-    if(ENABLE_SOLID)
+    endif(ENABLE_PLASMA_RUBY)
+    if(ENABLE_SOLID_RUBY)
         add_subdirectory( solid )
         set(SOLID_ENABLED "yes")
-    endif(ENABLE_SOLID)
+    endif(ENABLE_SOLID_RUBY)
 endif(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
 
 message(STATUS "Build QtRuby... " ${QTRUBY_ENABLED})
-message(STATUS "Build QtWebKit... " ${QTWEBKIT_ENABLED})
-message(STATUS "Build QtUiTools... " ${QTUITOOLS_ENABLED})
+message(STATUS "Build QtWebKit Ruby... " ${QTWEBKIT_ENABLED})
+message(STATUS "Build QtUiTools Ruby... " ${QTUITOOLS_ENABLED})
 
-message(STATUS "Build Soprano... " ${SOPRANO_ENABLED})
-message(STATUS "Build QScintilla... " ${QSCINTILLA_ENABLED})
-message(STATUS "Build Qwt... " ${QWT_ENABLED})
-message(STATUS "Build Phonon... " ${PHONON_ENABLED})
+message(STATUS "Build Soprano Ruby... " ${SOPRANO_ENABLED})
+message(STATUS "Build QScintilla Ruby... " ${QSCINTILLA_ENABLED})
+message(STATUS "Build Qwt Ruby... " ${QWT_ENABLED})
+message(STATUS "Build Phonon Ruby... " ${PHONON_ENABLED})
 
-message(STATUS "Build Akonadi... " ${AKONADI_ENABLED})
-message(STATUS "Build KHTML... " ${KHTML_ENABLED})
+message(STATUS "Build Akonadi Ruby... " ${AKONADI_ENABLED})
+message(STATUS "Build KHTML Ruby... " ${KHTML_ENABLED})
 message(STATUS "Build Korundum... " ${KORUNDUM_ENABLED})
-message(STATUS "Build KDevPlatform... " ${KDEVPLATFORM_ENABLED})
-message(STATUS "Build KTextEditor... " ${KTEXTEDITOR_ENABLED})
-message(STATUS "Build Nepomuk... " ${NEPOMUK_ENABLED})
-message(STATUS "Build Okular... " ${OKULAR_ENABLED})
-message(STATUS "Build Plasma... " ${PLASMA_ENABLED})
-message(STATUS "Build Solid... " ${SOLID_ENABLED})
+message(STATUS "Build KDevPlatform Ruby... " ${KDEVPLATFORM_ENABLED})
+message(STATUS "Build KTextEditor Ruby... " ${KTEXTEDITOR_ENABLED})
+message(STATUS "Build Nepomuk Ruby... " ${NEPOMUK_ENABLED})
+message(STATUS "Build Okular Ruby... " ${OKULAR_ENABLED})
+message(STATUS "Build Plasma Ruby... " ${PLASMA_ENABLED})
+message(STATUS "Build Solid Ruby... " ${SOLID_ENABLED})
 
 #####################################################################
 # Kross Ruby
--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #823147:823148
@@ -1,101 +1,101 @@
 OPTION(ENABLE_SMOKE "build Smoke" ON)
-OPTION(ENABLE_SMOKEQTWEBKIT "build SmokeQtWebKit" ON)
-OPTION(ENABLE_SMOKEQTUITOOLS "build SmokeQtUiTools" ON)
+OPTION(ENABLE_SMOKEQTWEBKIT "build QtWebKitSmoke" ON)
+OPTION(ENABLE_SMOKEQTUITOOLS "build QtUiToolsSmoke" ON)
 
-OPTION(ENABLE_SMOKEPHONON "build SmokePhonon" ON)
-OPTION(ENABLE_SMOKEQSCI "build SmokeQsci" OFF)
-OPTION(ENABLE_SMOKEQWT "build SmokeQwt" OFF)
-OPTION(ENABLE_SMOKESOPRANO "build SmokeSoprano" OFF)
+OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" ON)
+OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" OFF)
+OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
+OPTION(ENABLE_SOPRANO_SMOKE "build SopranoSmoke" OFF)
 
-OPTION(ENABLE_SMOKEAKONADI "build SmokeAkonadi" OFF)
-OPTION(ENABLE_SMOKEPLASMA "build SmokePlasma" OFF)
-OPTION(ENABLE_SMOKEKDE "build SmokeKDE" ON)
-OPTION(ENABLE_SMOKEKDEVPLATFORM "build SmokeKDevPlatform" OFF)
-OPTION(ENABLE_SMOKEKHTML "build SmokeKHTML" ON)
-OPTION(ENABLE_SMOKEKTEXTEDITOR "build SmokeKTextEditor" ON)
-OPTION(ENABLE_SMOKENEPOMUK "build SmokeNepomuk" OFF)
-OPTION(ENABLE_SMOKEOKULAR "build SmokeOkular" OFF)
-OPTION(ENABLE_SMOKESOLID "build SmokeSolid" ON)
+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)
 
 set(SMOKE_ENABLED "no")
 if(ENABLE_SMOKE)
     add_subdirectory(qt)
     set(SMOKE_ENABLED "yes - Qt")
 
-    if(ENABLE_SMOKEQTWEBKIT)
+    if(ENABLE_QTWEBKIT_SMOKE)
         add_subdirectory(qtwebkit)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtWebKit")
-    endif(ENABLE_SMOKEQTWEBKIT)
+    endif(ENABLE_QTWEBKIT_SMOKE)
 
-    if(ENABLE_SMOKEQTUITOOLS)
+    if(ENABLE_QTUITOOLS_SMOKE)
         add_subdirectory(qtuitools)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, QtUiTools")
-    endif(ENABLE_SMOKEQTUITOOLS)
+    endif(ENABLE_QTUITOOLS_SMOKE)
 
-    if(ENABLE_SMOKEPHONON)
+    if(ENABLE_PHONON_SMOKE)
         add_subdirectory(phonon)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Phonon")
-    endif(ENABLE_SMOKEPHONON)
+    endif(ENABLE_PHONON_SMOKE)
 
-    if(ENABLE_SMOKEQSCI)
+    if(ENABLE_QSCI_SMOKE)
         add_subdirectory(qsci)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, QScintilla2")
-    endif(ENABLE_SMOKEQSCI)
+    endif(ENABLE_QSCI_SMOKE)
 
-    if(ENABLE_SMOKEQWT)
+    if(ENABLE_QWT_SMOKE)
         add_subdirectory(qwt)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Qwt")
-    endif(ENABLE_SMOKEQWT)
+    endif(ENABLE_QWT_SMOKE)
 
-    if(ENABLE_SMOKESOLID)
+    if(ENABLE_SOLID_SMOKE)
         add_subdirectory(solid)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Solid")
-    endif(ENABLE_SMOKESOLID)
+    endif(ENABLE_SOLID_SMOKE)
 
-    if(ENABLE_SMOKESOPRANO)
+    if(ENABLE_SOPRANO_SMOKE)
         add_subdirectory(soprano)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Soprano")
-    endif(ENABLE_SMOKESOPRANO)
+    endif(ENABLE_SOPRANO_SMOKE)
 
-    if(ENABLE_SMOKEPLASMA)
+    if(ENABLE_PLASMA_SMOKE)
         add_subdirectory(plasma)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Plasma")
-    endif(ENABLE_SMOKEPLASMA)
+    endif(ENABLE_PLASMA_SMOKE)
 
-    if(ENABLE_SMOKEKDE)
+    if(ENABLE_KDE_SMOKE)
         add_subdirectory(kde)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDE")
-    endif(ENABLE_SMOKEKDE)
+    endif(ENABLE_KDE_SMOKE)
 
-    if(ENABLE_SMOKEAKONADI)
+    if(ENABLE_AKONADI_SMOKE)
         add_subdirectory(akonadi)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
-    endif(ENABLE_SMOKEAKONADI)
+    endif(ENABLE_AKONADI_SMOKE)
 
-    if(ENABLE_SMOKEKDEVPLATFORM)
+    if(ENABLE_KDEVPLATFORM_SMOKE)
         add_subdirectory(kdevplatform)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KDevPlatform")
-    endif(ENABLE_SMOKEKDEVPLATFORM)
+    endif(ENABLE_KDEVPLATFORM_SMOKE)
 
-    if(ENABLE_SMOKEKHTML)
+    if(ENABLE_KHTML_SMOKE)
         add_subdirectory(khtml)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
-    endif(ENABLE_SMOKEKHTML)
+    endif(ENABLE_KHTML_SMOKE)
 
-    if(ENABLE_SMOKEKTEXTEDITOR)
+    if(ENABLE_KTEXTEDITOR_SMOKE)
         add_subdirectory(ktexteditor)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, KTextEditor")
-    endif(ENABLE_SMOKEKTEXTEDITOR)
+    endif(ENABLE_KTEXTEDITOR_SMOKE)
 
-    if(ENABLE_SMOKENEPOMUK)
+    if(ENABLE_NEPOMUK_SMOKE)
         add_subdirectory(nepomuk)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
-    endif(ENABLE_SMOKENEPOMUK)
+    endif(ENABLE_NEPOMUK_SMOKE)
 
-    if(ENABLE_SMOKEOKULAR)
+    if(ENABLE_OKULAR_SMOKE)
         add_subdirectory(okular)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
-    endif(ENABLE_SMOKEOKULAR)
+    endif(ENABLE_OKULAR_SMOKE)
 
 endif(ENABLE_SMOKE)
 



More information about the Kde-bindings mailing list