koffice

[Laurent Montel]

SVN commit 534050 by mlaurent:

Add first cmake support for ruby kross bindings
It's a modified version from cmake-2.4.0 FindRuby
Perhaps we can merge it for cmake-2.4.1
CCMAIL: kde-buildsystem at kde.org


 A             cmake/modules/FindRUBY.cmake  
 M  +6 -2      libs/kross/CMakeLists.txt  
 M  +2 -2      libs/kross/ruby/CMakeLists.txt  


--- trunk/koffice/libs/kross/CMakeLists.txt #534049:534050
@@ -1,6 +1,6 @@
 kde4_header()
 macro_optional_find_package(PythonLibs)
-
+macro_optional_find_package(RUBY)
 include_directories( ${KOFFICECORE_INCLUDES} )
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
@@ -14,10 +14,14 @@
 	add_subdirectory(python)
 endif(PYTHON_INCLUDE_PATH)		
 
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(RUBYSUBDIR)")
+# Laurent: perhaps add new search info
+if(RUBY_INCLUDE_PATH)
+	add_subdirectory(ruby)
+endif(RUBY_INCLUDE_PATH)
 
 
 
+
 ########### install files ###############
 
 
--- trunk/koffice/libs/kross/ruby/CMakeLists.txt #534049:534050
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${CMAKE_SOURCE_DIR}/lib/kross ${KDE4_INCLUDES} )
+include_directories( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/lib/kross ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
@@ -17,7 +17,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} krossruby )
 
-target_link_libraries(krossruby  ${KDE4_KDECORE_LIBS} krossapi krossmain )
+target_link_libraries(krossruby  ${KDE4_KDECORE_LIBS} ${RUBY_LIBRARY} krossapi krossmain )
 
 install_targets(${PLUGIN_INSTALL_DIR} krossruby )