From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 17 Feb 2010 15:38:07 +0000 (+0000)
Subject: Make ruby in consideration with cmake.
X-Git-Tag: SVN~627
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c72b71d482f658cfc9cf180ca62d4504046d4002

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 b949750407..6ef817ae32 100644
--- 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)
 
-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")
-endif(HAVE_RUBY_H)
+endif(HAVE_RUBY_H AND NOT disable_ruby)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 24cd32016b..d3158552c9 100644
--- 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_ruby "This variable set ruby use." ON)
 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 be91199427..602217bab0 100644
--- 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>
-#include "provate.h"
+#include "private.h"
 #include "xbt/function_types.h"
 #include "context_sysv_config.h"