X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bf7c810ed53b509cc062dff51830ec5b2d72405..9f54e5c450791e19b01f31e86c93e5a603fd0c4b:/buildtools/Cmake/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index d950d6937b..bc8f7f0f16 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -9,10 +9,11 @@ find_program(CAT_EXE NAMES cat)
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
 SET(HAVE_RUBY_H 0)
-
+set(libruby "ruby1.8")
 if(NOT disable_ruby)
 	include(FindRuby)
 	set(OKITOKI no)
+	#message("RUBY_INCLUDE_PATH : ${RUBY_INCLUDE_PATH}")
 	foreach(path ${RUBY_INCLUDE_PATH})
 		if(NOT OKITOKI)
 			set(RUBY_INCLUDE_PATH ${path})
@@ -20,7 +21,20 @@ if(NOT disable_ruby)
 		endif(NOT OKITOKI)
 	endforeach(path ${RUBY_INCLUDE_PATH})
 	if(RUBY_INCLUDE_PATH)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix -fPIC ")
+		find_library(RUBY_LIB_PATH_1
+		NAMES ruby1.8
+		PATHS ${RUBY_INCLUDE_PATH}
+		)
+		find_library(RUBY_LIB_PATH_2
+		NAMES ruby.1.8
+		PATHS ${RUBY_INCLUDE_PATH}
+		)
+		if(RUBY_LIB_PATH_2)
+			set(libruby "ruby.1.8")
+		endif(RUBY_LIB_PATH_2)
+		
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -fPIC ")
+		ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
 		SET(HAVE_RUBY_H 1)
 	endif(RUBY_INCLUDE_PATH)
 endif(NOT disable_ruby)
@@ -32,14 +46,21 @@ if(disable_java)
 else(disable_java)
 	include(FindJava)
 	include(FindJNI)
+	message("JNI.H : 	${JAVA_INCLUDE_PATH}")
+	message("JNI_MD.H : 	${JAVA_INCLUDE_PATH2}")
+	message("JAVAC : 	${JAVA_COMPILE}")
 	if(JAVA_INCLUDE_PATH)
 		set(HAVE_JNI_H 1)
 	endif(JAVA_INCLUDE_PATH)	
-	if(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
+	if(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
 		SET(HAVE_JAVA 1)
-	else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) 
+		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_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
+	endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
 endif(disable_java)
 #message("HAVE_JAVA ${HAVE_JAVA}")
 
@@ -208,11 +229,47 @@ if(NOT disable_lua)
 	NAMES lauxlib.h
 	PATHS "/sw/include/" "/usr/include/lua5.1/"
 	)
+	find_library(LUA_LIB_PATH_1
+	NAMES lua5.1
+	PATHS /usr
+	)
+	find_library(LUA_LIB_PATH_2
+	NAMES lua-5.1
+	PATHS /usr
+	)
+	find_library(LUA_LIB_PATH_3
+	NAMES lua.5.1.1
+	PATHS /sw
+	)
+
 	if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 		set(HAVE_LUA 1)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} ")
+		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} ")
+
+		if(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
+			#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_LUA5_1_LAUXLIB_H} ")
+		endif(NOT HAVE_LUA5_1_LUALIB_H STREQUAL HAVE_LUA5_1_LAUXLIB_H)
+
 	endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
+
+	if(LUA_LIB_PATH_1)
+		set(liblua lua5.1)
+	endif(LUA_LIB_PATH_1)
+
+	if(LUA_LIB_PATH_2)
+		set(liblua lua-5.1)
+	endif(LUA_LIB_PATH_2)
+
+	if(LUA_LIB_PATH_3)
+		set(liblua lua.5.1.1)
+	endif(LUA_LIB_PATH_3)
+
+	if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
+		set(HAVE_LUA 0)
+	endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
+
 endif(NOT disable_lua)
 #message("HAVE_LUA ${HAVE_LUA}")
 #message("${HAVE_LUA5_1_LUALIB_H} AND ${HAVE_LUA5_1_LAUXLIB_H}")
@@ -649,8 +706,11 @@ set(top_srcdir ${PROJECT_DIRECTORY})
 set(includedir ${prefix}/include)
 set(top_builddir ${PROJECT_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
-configure_file(${PROJECT_DIRECTORY}/buildtools/Cmake/src/smpicc.in ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY)
-configure_file(${PROJECT_DIRECTORY}/buildtools/Cmake/src/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY)
 
+configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in  ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY)
+configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY)
+
+exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpicc" OUTPUT_VARIABLE OKITOKI)
+exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE OKITOKI)
 
 #message("__END_GRAS_&_SIMGRID____\n")