[Kde-bindings] KDE/kdebindings

[Sebastian Sauer]

SVN commit 654080 by sebsauer:

* moved the "find gmcs" functionality from /CMakeLists.txt to /csharp/CMakeLists.txt
* turned add_subdirectory(csharp) into macro_optional_add_subdirectory(csharp) in /CMakeLists.txt - this allows an user to e.g. don't checkout csharp && still compile bindings with csharp disabled
* added ENABLE_QTRUBY (on by default) and ENABLE_KORUNDUM (off by default for now) to /ruby/CMakeLists.txt to be able to switch them easy on/off
* added ENABLE_QYOTO (on by default) to /csharp/CMakeLists.txt
* added more install samples to /README

CCMAIL: kde-bindings at kde.org



 M  +1 -17     CMakeLists.txt  
 M  +8 -4      README  
 M  +17 -1     csharp/CMakeLists.txt  
 M  +1 -1      python/CMakeLists.txt  
 M  +19 -7     ruby/CMakeLists.txt  
 M  +3 -0      ruby/krossruby/rubyextension.cpp  


--- trunk/KDE/kdebindings/CMakeLists.txt #654079:654080
@@ -18,24 +18,8 @@
 #add_subdirectory(smoke)
 macro_optional_add_subdirectory(smoke)
 
-###########################################
-# TODO get right of the definitions above
 macro_optional_add_subdirectory(ruby)
 macro_optional_add_subdirectory(python)
+macro_optional_add_subdirectory(csharp)
 
-# find 'gmcs'
-MESSAGE (STATUS "Looking for gmcs")
-FIND_PROGRAM (GMCS_PATH gmcs)
-IF (NOT GMCS_PATH)
-	MESSAGE (STATUS "Looking for gmcs - not found")
-	MESSAGE (FATAL_ERROR "gmcs was not found on your system")
-ELSE (NOT GMCS_PATH)
-	MESSAGE (STATUS "Looking for gmcs - found - ${GMCS_PATH}")
-ENDIF (NOT GMCS_PATH)
-
-# How does macro_optional_add_subdirectory work, should csharp use it?
-if(GMCS_PATH)
-   add_subdirectory( csharp )
-endif(GMCS_PATH)
-
 macro_display_feature_log()
--- trunk/KDE/kdebindings/README #654079:654080
@@ -10,11 +10,15 @@
 
 Install examples:
 # Compile and install
-cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ .. && make && make install
+cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ . && make && make install
 # Disable compiling of the Kross ruby and python backends
-cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_KROSSRUBY=off -DENABLE_KROSSPYTHON=off
-# Compile with debugging enabled and point to the ruby backend
-cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DCMAKE_BUILD_TYPE=debugfull -DRUBY_INCLUDE_PATH=/usr/lib/ruby/1.8/i486-linux/ -DRUBY_LIBRARY=/usr/lib/libruby1.8.so ..
+cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_KROSSRUBY=off -DENABLE_KROSSPYTHON=off .
+# Compile with debugging enabled and point to the used ruby version
+cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DCMAKE_BUILD_TYPE=debugfull -DRUBY_INCLUDE_PATH=/usr/lib/ruby/1.8/i486-linux/ -DRUBY_LIBRARY=/usr/lib/libruby1.8.so .
+# Disable compiling of Qyoto
+cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_QYOTO=off .
+# Disable compiling of QtRuby and Korundum
+cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_QTRUBY=off -DENABLE_KORUNDUM=off .
 
 Notes for developers
 --------------------
--- trunk/KDE/kdebindings/csharp/CMakeLists.txt #654079:654080
@@ -1 +1,17 @@
-ADD_SUBDIRECTORY(qyoto)
+OPTION(ENABLE_QYOTO "build Qyoto" ON)
+
+set(QYOTO_ENABLED "no")
+if(ENABLE_QYOTO)
+    # find 'gmcs'
+    MESSAGE (STATUS "Looking for gmcs")
+    FIND_PROGRAM (GMCS_PATH gmcs)
+    IF (NOT GMCS_PATH)
+        MESSAGE (STATUS "Looking for gmcs - not found")
+        MESSAGE (FATAL_ERROR "gmcs was not found on your system")
+    ELSE (NOT GMCS_PATH)
+        MESSAGE (STATUS "Looking for gmcs - found - ${GMCS_PATH}")
+        add_subdirectory( qyoto )
+        set(QYOTO_ENABLED "yes")
+    ENDIF (NOT GMCS_PATH)
+endif(ENABLE_QYOTO)
+message(STATUS "Build Qyoto... " ${QYOTO_ENABLED})
--- trunk/KDE/kdebindings/python/CMakeLists.txt #654079:654080
@@ -21,4 +21,4 @@
     message(STATUS "Python Libraries: " ${PYTHON_LIBRARIES})
     message(STATUS "Python Include Path: " ${PYTHON_INCLUDE_PATH})
 endif(ENABLE_KROSSPYTHON)
-message(STATUS "Compile Kross Python... " ${KROSSPYTHON_ENABLED})
+message(STATUS "Build Kross Python... " ${KROSSPYTHON_ENABLED})
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #654079:654080
@@ -1,22 +1,34 @@
 macro_optional_find_package(RUBY)
 
 #####################################################################
-# QtRuby
+# QtRuby/Korundum
 
+OPTION(ENABLE_QTRUBY "build QtRuby" ON)
+OPTION(ENABLE_KORUNDUM "build Korundum" OFF)
+
+set(QTRUBY_ENABLED "no")
+set(KORUNDUM_ENABLED "no")
 if(RUBY_EXECUTABLE)
-   add_subdirectory( qtruby )
-   #add_subdirectory( korundum )
+    if(ENABLE_QTRUBY)
+        add_subdirectory( qtruby )
+        set(QTRUBY_ENABLED "yes")
+    endif(ENABLE_QTRUBY)
+    if(ENABLE_KORUNDUM)
+        add_subdirectory( korundum )
+        set(KORUNDUM_ENABLED "yes")
+    endif(ENABLE_KORUNDUM)
 endif(RUBY_EXECUTABLE)
+message(STATUS "Build QtRuby... " ${QTRUBY_ENABLED})
+message(STATUS "Build Korundum... " ${KORUNDUM_ENABLED})
 
 #####################################################################
 # Kross Ruby
 
-OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" ON)
-#OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" OFF)
+OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" ON)
+#OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" OFF)
 
 set(KROSSRUBY_ENABLED "no")
 if(ENABLE_KROSSRUBY)
-    macro_optional_find_package(RUBY)
     if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
         EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(have_func('rb_hash_foreach') ? 0 : 1)" RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET)
         if (RUBY_HASH_FOREACH EQUAL 0)
@@ -39,4 +51,4 @@
     message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
     message(STATUS "Ruby Include Path: " ${RUBY_INCLUDE_PATH})
 endif(ENABLE_KROSSRUBY)
-message(STATUS "Compile Kross Ruby... " ${KROSSRUBY_ENABLED})
+message(STATUS "Build Kross Ruby... " ${KROSSRUBY_ENABLED})
--- trunk/KDE/kdebindings/ruby/krossruby/rubyextension.cpp #654079:654080
@@ -259,6 +259,9 @@
 VALUE RubyExtension::callDisconnect(int argc, VALUE *argv, VALUE self)
 {
     //TODO
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
+    Q_UNUSED(self);
     return Qfalse;
 }