X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2579e99a0e9204d92bc8665e49ac44a3816c74bb..608740110c8b0b879fb05a34d730e48603ac1242:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 33be2d13ed..1ff7dd763c 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -68,7 +68,6 @@ set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 SET(HAVE_RUBY 0)
 set(HAVE_LUA 0)
-SET(HAVE_JAVA 0)
 SET(HAVE_TRACING 0)
 
 if(enable_tracing)
@@ -110,7 +109,7 @@ endif(enable_lua)
 if(enable_ruby)
 	include(FindRuby)
 	if(RUBY_LIBRARY)
-		if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
+		if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
 			set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
 			string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY})
 			if(NOT RUBY_LIBRARY_NAME)
@@ -124,10 +123,10 @@ if(enable_ruby)
 			endif(NOT operation)
 			ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix")
 			SET(HAVE_RUBY 1)
-		else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
-			message("Ruby binding need version 1.8.x actually version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
+		else(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
+			message("Ruby binding need version 1.9.x actually version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x")
 			SET(HAVE_RUBY 0)
-		endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "8")
+		endif(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9")
 	else(RUBY_LIBRARY)
 		SET(HAVE_RUBY 0)
 	endif(RUBY_LIBRARY)
@@ -153,26 +152,6 @@ if(enable_smpi)
 	endif(HAVE_F2C_H)	
 endif(enable_smpi)
 
-#--------------------------------------------------------------------------------------------------
-### Initialize of CONTEXT JAVA
-
-if(enable_java)
-	include(FindJava)
-	include(FindJNI)
-	if(JAVA_INCLUDE_PATH)
-		set(HAVE_JNI_H 1)
-	endif(JAVA_INCLUDE_PATH)	
-	if(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-		SET(HAVE_JAVA 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-		if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")			
-		endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-	else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
-		SET(HAVE_JAVA 0)
-	endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-endif(enable_java)
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS
 if(NOT enable_gtnets OR enable_supernovae)
@@ -670,7 +649,7 @@ foreach(fct ${diff_va})
 	endif(COMPILE_VA_NULL_VAR)
 	
 endforeach(fct ${diff_va})
-file(REMOVE "${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c")
+file(REMOVE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c")
 
 #--------------------------------------------------------------------------------------------------
 ### check for getline