[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2007-03-26 19:53:39
Message-ID: 1174938819.267682.27411.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 646861 by sebsauer:

* added the ruby+python dirs as build subdirs.
* disable compiling the both krossmodules per default for now.



 M  +6 -0      CMakeLists.txt  
 M  +2 -2      python/CMakeLists.txt  
 M  +4 -4      python/krosspython/CMakeLists.txt  
 M  +2 -2      ruby/CMakeLists.txt  


--- trunk/KDE/kdebindings/CMakeLists.txt #646860:646861
@@ -21,3 +21,9 @@
 endif(RUBY_EXECUTABLE)
 
 macro_display_feature_log()
+
+
+###########################################
+# TODO get right of the definitions above
+add_subdirectory(ruby)
+add_subdirectory(python)
--- trunk/KDE/kdebindings/python/CMakeLists.txt #646860:646861
@@ -6,8 +6,8 @@
 #   cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_KROSSPYTHON=off
 #   cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DCMAKE_BUILD_TYPE=debugfull \
-DPYTHON_LIBRARY=/usr/lib/python2.5/config/libpython2.5.so \
-DPYTHON_LIBRARIES=/usr/lib/python2.5/config/libpython2.5.so \
-DPYTHON_INCLUDE_PATH=/usr/include/python2.5 ..  
-OPTION(ENABLE_KROSSPYTHON "build Python scripting library (Kross)" ON)
-#OPTION(ENABLE_KROSSPYTHON "build Python scripting library (Kross)" OFF)
+#OPTION(ENABLE_KROSSPYTHON "build Python scripting library (Kross)" ON)
+OPTION(ENABLE_KROSSPYTHON "build Python scripting library (Kross)" OFF)
 
 set(KROSSPYTHON_ENABLED "no")
 if(ENABLE_KROSSPYTHON)
--- trunk/KDE/kdebindings/python/krosspython/CMakeLists.txt #646860:646861
@@ -8,10 +8,10 @@
 ##add_subdirectory( scripts )
 
 set(libkrosspythoncxx_SRCS 
-    ${CMAKE_SOURCE_DIR}/libs/kross/python/cxx/cxxsupport.cxx 
-    ${CMAKE_SOURCE_DIR}/libs/kross/python/cxx/cxx_extensions.cxx 
-    ${CMAKE_SOURCE_DIR}/libs/kross/python/cxx/cxxextensions.c 
-    ${CMAKE_SOURCE_DIR}/libs/kross/python/cxx/IndirectPythonInterface.cxx
+    ${CMAKE_SOURCE_DIR}/python/krosspython/cxx/cxxsupport.cxx 
+    ${CMAKE_SOURCE_DIR}/python/krosspython/cxx/cxx_extensions.cxx 
+    ${CMAKE_SOURCE_DIR}/python/krosspython/cxx/cxxextensions.c 
+    ${CMAKE_SOURCE_DIR}/python/krosspython/cxx/IndirectPythonInterface.cxx
 )
 
 ########### next target ###############
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #646860:646861
@@ -6,8 +6,8 @@
 #   cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DENABLE_KROSSRUBY=off
 #   cmake -DCMAKE_INSTALL_PREFIX=/opt/kde4/ -DCMAKE_BUILD_TYPE=debugfull \
-DKOFFICE_ENABLE_SCRIPTING=y -DRUBY_INCLUDE_PATH=/usr/lib/ruby/1.8/i486-linux/ \
-DRUBY_LIBRARY=/usr/lib/libruby1.8.so ..  
-OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" ON)
-#OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" OFF)
+#OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" ON)
+OPTION(ENABLE_KROSSRUBY "build Ruby scripting library (Kross)" OFF)
 
 set(KROSSRUBY_ENABLED "no")
 if(ENABLE_KROSSRUBY)


[prev in list] [next in list] [prev in thread] [next in thread]