[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkorundum=5D_modules=3A_remove_the_krossruby_cmake_c?=
From: Arno Rehn <arno () arnorehn ! de>
Date: 2011-01-31 22:11:14
Message-ID: 20110131221114.D50C2A609B () git ! kde ! org
[Download RAW message or body]
Git commit e1011c19e61945d711f46f4b2493c7fb11f304c8 by Arno Rehn.
Pushed by arnorehn into branch 'master'.
remove the krossruby cmake code. it's now in its own repo.
M +0 -42 modules/CMakeLists.txt
http://commits.kde.org/4b423e44/e1011c19e61945d711f46f4b2493c7fb11f304c8
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 87300d0..46add2a 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -45,46 +45,4 @@ find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS \
${KDE4_INCLUDE_DIR})
macro_optional_add_bindings(KATE_INCLUDE_DIR "Kate" kate)
-#####################################################################
-# Kross Ruby
-
-OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" ON)
-#OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" OFF)
-
-if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
- 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)
-
- set(CMAKE_REQUIRED_INCLUDES ${RUBY_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${RUBY_LIBRARY})
- CHECK_CXX_SOURCE_COMPILES("
- #include <ruby.h>
- int main() { ruby_init(); return 0; }" RubyCompiles)
- if(RubyCompiles)
- if(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND \
RUBY_VERSION_MINOR LESS 9)
- set(BUILD_KrossRuby TRUE)
- endif(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND \
RUBY_VERSION_MINOR LESS 9)
- else(RubyCompiles)
- message(STATUS "Failed to compile a C++ program that embeds ruby.")
- endif(RubyCompiles)
-
- else (RUBY_HASH_FOREACH EQUAL 0)
-
- # 2007-02-12 sebsauer; this is a workaround for the case we failed to load
- # the "mkmf" library what is the case e.g. on some debian distributions.
- #EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(0)" \
RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET ERROR_QUIET)
- #if (${RUBY_HASH_FOREACH} EQUAL 0)
- message(STATUS "The detected Ruby is too old for kross. A Ruby which has \
rb_hash_foreach is required. Upgrade to 1.8.2 or later")
- #else (${RUBY_HASH_FOREACH} EQUAL 0)
- # message(STATUS "Failed to load the Ruby mkmf library. Please install \
the Ruby developer packages.")
- #endif (${RUBY_HASH_FOREACH} EQUAL 0)
-
- endif (RUBY_HASH_FOREACH EQUAL 0)
-endif (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
-message(STATUS "Ruby Executable: " ${RUBY_EXECUTABLE})
-message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
-message(STATUS "Ruby Include Directories: " ${RUBY_INCLUDE_DIRS})
-
-macro_optional_add_bindings(BUILD_KrossRuby "KrossRuby" krossruby)
-
macro_display_bindings_log()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic