Make ruby in consideration with cmake.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7110 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index b949750..6ef817a 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -11,9 +11,9 @@ string(REPLACE "/ruby.h" "" RUBY_PATH ${RUBY_PATH})
 message("RUBY_PATH ${RUBY_PATH}")
 CHECK_INCLUDE_FILE(${RUBY_PATH}/ruby.h HAVE_RUBY_H)
 
 message("RUBY_PATH ${RUBY_PATH}")
 CHECK_INCLUDE_FILE(${RUBY_PATH}/ruby.h HAVE_RUBY_H)
 

-if(HAVE_RUBY_H)
+if(HAVE_RUBY_H AND NOT disable_ruby)

        add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
        add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")

-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY_H AND NOT disable_ruby)

 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 24cd320..d315855 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -21,5 +21,6 @@ option(supernovae "Supernovae mode." OFF)
 option(disable_java "This variable set the java context." ON)
 option(disable_gtnets "This variable set the gtnets context." ON)
 option(disable_lua "This variable set lua use." ON)
 option(disable_java "This variable set the java context." ON)
 option(disable_gtnets "This variable set the gtnets context." ON)
 option(disable_lua "This variable set lua use." ON)

+option(disable_ruby "This variable set ruby use." ON)

 option(enable_compile_warnings "" OFF)
 option(enable_compile_optimizations "" OFF)
 option(enable_compile_warnings "" OFF)
 option(enable_compile_optimizations "" OFF)

diff --git a/src/bindings/ruby/smx_context_ruby.c b/src/bindings/ruby/smx_context_ruby.c
index be91199..602217b 100644 (file)
--- a/src/bindings/ruby/smx_context_ruby.c
+++ b/src/bindings/ruby/smx_context_ruby.c
@@ -7,7 +7,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include <ruby.h>
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include <ruby.h>

-#include "provate.h"
+#include "private.h"

 #include "xbt/function_types.h"
 #include "context_sysv_config.h"
 
 #include "xbt/function_types.h"
 #include "context_sysv_config.h"