From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Mar 2010 09:51:24 +0000 (+0000)
Subject: Solve problem with lib name of java ruby and lua.
X-Git-Tag: SVN~348
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f9f61beda52cb096a19f11d339b6a1a25825f17b

Solve problem with lib name of java ruby and lua.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7392 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 87f8e57fc6..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}")
 
@@ -216,11 +237,21 @@ if(NOT disable_lua)
 	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)
@@ -231,9 +262,13 @@ if(NOT disable_lua)
 		set(liblua lua-5.1)
 	endif(LUA_LIB_PATH_2)
 
-	if(NOT LUA_LIB_PATH_1 AND NOT 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)
+	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}")
diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index e5810ab266..def28f4f7e 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -10,7 +10,7 @@ else(supernovae)
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "ruby1.8")
+set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
 if(HAVE_RUBY_H)
@@ -43,8 +43,8 @@ if(HAVE_GTNETS)
 endif(HAVE_GTNETS)
 
 if(NOT HAVE_RUBY_H)
-	string(REPLACE "ruby1.8 -l" "" SIMGRID_DEP ${SIMGRID_DEP})
-	string(REPLACE "ruby1.8" "" SIMGRID_DEP ${SIMGRID_DEP})
+	string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
+	string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
 endif(NOT HAVE_RUBY_H)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP} -fprofile-arcs)