Corection of the gtnets-ruby bug with node.h and begining of the doc edition.

[simgrid.git] / buildtools / CPACK / src / CMakeCompleteInFiles.txt

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index b87989b..97d60f2 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -4,6 +4,19 @@ include(CheckIncludeFiles)
 include(CheckLibraryExists)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
+SET(HAVE_RUBY_H 0)
+if(NOT disable_ruby)
+       SET(RUBY_PATH "non")
+       find_program(FIND_EXE NAMES find)
+       exec_program("${FIND_EXE} /usr/lib -name ruby.h" OUTPUT_VARIABLE RUBY_PATH)
+       string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
+       message("RUBY_PATH ${RUBY_PATH}")
+       if(RUBY_PATH)
+       SET(HAVE_RUBY_H 1)
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
+       #add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC")
+       endif(RUBY_PATH)
+endif(NOT disable_ruby)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
@@ -538,11 +551,11 @@ try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
        OUTPUT_VARIABLE GETLINE_OUTPUT
        )
 
-if(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
+if(NOT COMPILE_RESULT_VAR)
 SET(need_getline "#define SIMGRID_NEED_GETLINE 1")
-else(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
+else(NOT COMPILE_RESULT_VAR)
 SET(need_getline "")
-endif(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
+endif(NOT COMPILE_RESULT_VAR)
 
 ### check for a working snprintf
 CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)