X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a8c5e6530806176acb8cea8e2bbaf733a4719d4..566be4f1a9393406a6adc1b2fe815c6d1ae4e3bc:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 5bde0268f9..c6cc60e194 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -98,19 +98,11 @@ else(enable_model-checking AND HAVE_MMAP)
 endif(enable_model-checking AND HAVE_MMAP)
 
 if(enable_lua)
-	include(FindLua51)
+	include(FindLua51Simgrid)
 	if(LUA51_FOUND)
 		set(HAVE_LUA 1)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${LUA_INCLUDE_DIR} ")
-		foreach(path_lua ${LUA_LIBRARIES})
-		string(REGEX REPLACE "liblua.*" "" path_lua_to_use ${path_lua})
-		string(REGEX MATCH ".*lua.*" operation "${path_lua}")
-		if(operation)
-			string(REGEX REPLACE "${path_lua_to_use}" "" liblua ${path_lua})
-			string(REPLACE "lib" "" liblua "${liblua}")
-			string(REGEX REPLACE "[.][^.]*$" "" liblua "${liblua}")			
-		endif(operation)
-		endforeach(path_lua ${LUA_LIBRARIES})
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${LUA_LIBRARY_DIR} ")
 	else(LUA51_FOUND)
 		message("Lua binding need version 5.1 and cmake version 2.8")
 		message("Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
@@ -205,17 +197,20 @@ if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
     if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
     
         if(HAVE_GRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_GRAPH_H})
+        	string(REPLACE "/graphviz/graph.h" "" file_graphviz_h ${HAVE_GRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(GRAPH_H 1)
         endif(HAVE_GRAPH_H)
         
         if(HAVE_AGRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_AGRAPH_H})
+        	string(REPLACE "/graphviz/agraph.h" "" file_graphviz_h ${HAVE_AGRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(AGRAPH_H 1)
         endif(HAVE_AGRAPH_H)
         
         if(HAVE_CGRAPH_H)
-        	string(REPLACE "/graphviz" "" file_graphviz_h ${HAVE_CGRAPH_H})
+        	string(REPLACE "/graphviz/cgraph.h" "" file_graphviz_h ${HAVE_CGRAPH_H})
+        	string(REPLACE "/graphviz" "" file_graphviz_h ${file_graphviz_h})
         	set(CGRAPH_H 1)
         endif(HAVE_CGRAPH_H)  
          
@@ -234,8 +229,14 @@ if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
     		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${lib_graphviz} ")
     	endif(NOT operation)
     	
+    else(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+        set(enable_graphviz "0")
     endif(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+    
+else(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
+    set(enable_graphviz "0")
 endif(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
+
 endif(enable_graphviz AND HAVE_CDT_LIB)
 #--------------------------------------------------------------------------------------------------
 ### Initialize of pcre