X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27e5b03d75af4ca5b2e937be36caf733abfa84e3..8f7873c57495707ccbdad488eab21356bf5496d7:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index bd2c1a41b8..7a8ae342f7 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -7,9 +7,7 @@ include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(TestBigEndian)
-if(enable_graphviz)
 include(FindGraphviz)
-endif(enable_graphviz)
 TEST_BIG_ENDIAN(BIGENDIAN)
 
 # Checks for header libraries functions.
@@ -199,62 +197,6 @@ else(NOT enable_gtnets OR enable_supernovae)
 endif(NOT enable_gtnets OR enable_supernovae)
 
 #--------------------------------------------------------------------------------------------------
-### Initialize of cgraph
-if(enable_graphviz AND HAVE_CDT_LIB)
-if(HAVE_CGRAPH_LIB OR HAVE_AGRAPH_LIB)
-
-    if(HAVE_AGRAPH_LIB)
-     	string(REGEX REPLACE "/libagraph.*" "" lib_graphviz ${HAVE_AGRAPH_LIB})   
-    else(HAVE_AGRAPH_LIB)
-        if(HAVE_CGRAPH_LIB)
-     	    string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB})   
-        endif(HAVE_CGRAPH_LIB)
-    endif(HAVE_AGRAPH_LIB)
-      
-    if(HAVE_GRAPH_H OR HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-    
-        if(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/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/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)  
-         
-        string(REGEX MATCH "-I${file_graphviz_h} " operation "${CMAKE_C_FLAGS}")
-    	if(NOT operation)
-    		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_graphviz_h} ")
-    	endif(NOT operation)
-    	
-    	string(REGEX MATCH "-I${file_graphviz_h}/graphviz " operation "${CMAKE_C_FLAGS}")
-    	if(NOT operation)
-    		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_graphviz_h}/graphviz ")
-    	endif(NOT operation)
-    	
-    	string(REGEX MATCH "-L${lib_graphviz} " operation "${CMAKE_C_FLAGS}")
-    	if(NOT operation)
-    		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
 find_library(PATH_PCRE_LIB pcre)
@@ -809,8 +751,8 @@ configure_file("${PROJECT_DIRECTORY}/include/simgrid_config.h.in" 		"${CMAKE_CUR
 set(top_srcdir "${PROJECT_DIRECTORY}")
 set(srcdir "${PROJECT_DIRECTORY}/src")
 
-set(exec_prefix ${prefix})
-set(includedir ${prefix}/include)
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
 set(top_builddir ${PROJECT_DIRECTORY})
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_LINKARGS "${CMAKE_CURRENT_BINARY_DIR}/lib")