X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70096f5af06d2a2470159857e1f67705a2269602..66c1b7030c35c15410e04b3382e8ecb051df1d27:/buildtools/CPACK/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index 699c67d222..67da361424 100644
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -4,20 +4,17 @@ include(CheckIncludeFiles)
 include(CheckLibraryExists)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
+SET(HAVE_RUBY_H 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)
+string(REPLACE "/ruby.h" "/" RUBY_PATH ${RUBY_PATH})
+#message("RUBY_PATH ${RUBY_PATH}")
+
+if(NOT disable_ruby AND RUBY_PATH)
+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
+	SET(HAVE_RUBY_H 1)
+endif(NOT disable_ruby AND RUBY_PATH)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
@@ -43,19 +40,15 @@ 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_LDFLAGS "-L${gtnets_path}/lib")
 	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)	
+	exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)	
 	if(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 0)
 		message("GTnetS doesn't works : set -Ddisable_gtnets=on")
 	else(COMPILE_GTNETS_VAR)
 		SET(HAVE_GTNETS 1)
-		set(INCLUDES
-			${INCLUDES}
-			${GTNETS_CPPFLAGS}
-		)
-		add_definitions(${GTNETS_LDFLAGS})
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
 	endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")