X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/458b7f4c89a5313f89f1fa1ecd566850c1e4dffe..1287395bda8fb8b4de06e16172828ee5f74aee27:/buildtools/CPACK/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 02bcf4a954..8fb357cb5c 100644
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -5,6 +5,18 @@ include(CheckLibraryExists)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 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}")
+	CHECK_INCLUDE_FILE(${RUBY_PATH}ruby.h HAVE_RUBY_H)
+	if(HAVE_RUBY_H)
+		add_definitions("-I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
+	endif(HAVE_RUBY_H)
+endif(NOT disable_ruby)
+
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
 if(disable_java)
@@ -28,12 +40,13 @@ endif(disable_java)
 if(disable_gtnets)
 	SET(HAVE_GTNETS 0)
 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)
-		message(FATAL_ERROR "GTnetS doesn't works : set -Ddisable_gtnets=on")
+		message("GTnetS doesn't works : set -Ddisable_gtnets=on")
 	else(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 1)
 		set(INCLUDES
@@ -95,9 +108,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")
@@ -146,8 +165,10 @@ if(with_context MATCHES "ucontext")
 	else(mcsc MATCHES "yes")
 		if(windows_context MATCHES "yes")
 			set(with_context "windows")
+			message("with_context ucontext change to windows")
 		else(windows_context MATCHES "yes")
 			set(with_context "pthread")
+			message("with_context ucontext change to pthread")
 		endif(windows_context MATCHES "yes")
 	endif(mcsc MATCHES "yes")
 endif(with_context MATCHES "ucontext")
@@ -529,11 +550,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)