X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6205ed5d9663539351b060dc60da6a5f42d8eda7..38f15716ff38170e6c9043eb25c9a503f2f9f343:/buildtools/CPACK/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 03818c9000..87a450c193 100644
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -4,6 +4,20 @@ include(CheckIncludeFiles)
 include(CheckLibraryExists)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
+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}")
+CHECK_INCLUDE_FILE(${RUBY_PATH}/ruby.h HAVE_RUBY_H)
+message("HAVE_RUBY_H ${HAVE_RUBY_H}")
+
+if(HAVE_RUBY_H)
+	set(INCLUDES
+		${INCLUDES}
+		"-I ${RUBY_PATH} -I ${${PROJECT_DIRECTORY}}/src/bindings/ruby"
+		)
+endif(HAVE_RUBY_H)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
@@ -30,7 +44,7 @@ if(disable_gtnets)
 else(disable_gtnets)
 	SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
 	set(GTNETS_LDFLAGS "-lgtnets -L${gtnets_path}/lib")
-	set(GTNETS_CPPFLAGS "-I${gtnets_path}/include -I${gtnets_path}/include/gtnets")
+	set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
 	exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR)	
 	if(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 0)
@@ -96,9 +110,15 @@ if(pthread MATCHES "yes")
 endif(pthread MATCHES "yes")
 
 # AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
+set(mcsc_flags "")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	set(mcsc_flags "-D_XOPEN_SOURCE")
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
 try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
 	${PROJECT_DIRECTORY}
 	${PROJECT_DIRECTORY}/CPACK/prog_test/prog_AC_CHECK_MCSC.c
+	COMPILE_DEFINITIONS "${mcsc_flags}"
 	)
 file(READ "${PROJECT_DIRECTORY}/conftestval" mcsc)
 if(mcsc MATCHES "yes")
@@ -532,11 +552,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)