Add a new default path for cgraph.

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

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 7e3e2ac..e61c78c 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -2,8 +2,14 @@ include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
+include(TestBigEndian)
+
+TEST_BIG_ENDIAN(BIGENDIAN)
 
-set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${CGRAPH_PATH}")
+set(CMAKE_REQUIRED_INCLUDES
+                       ${CGRAPH_PATH}
+                       ${CMAKE_REQUIRED_INCLUDES}
+                       )
 
 # Checks for header libraries functions.
 
@@ -388,8 +394,7 @@ endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 ###################################
 ## SimGrid and GRAS specific checks
 ##
-include(TestBigEndian)
-TEST_BIG_ENDIAN(BIGENDIAN)
+
 # Check architecture signature begin
 try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
        ${PROJECT_DIRECTORY}

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index a3e2766..5650bbd 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -4,7 +4,15 @@
 if(APPLE AND NOT CGRAPH_PATH)
        set(CGRAPH_PATH "/opt/local/include/graphviz" CACHE PATH "Path to cgraph.h")
 else(APPLE AND NOT CGRAPH_PATH)
-       set(CGRAPH_PATH "/usr/include/graphviz" CACHE PATH "Path to cgraph.h")
+
+       if(EXISTS "/usr/include/graphviz")
+               set(include_graphviz "/usr/include/graphviz")
+       endif(EXISTS "/usr/include/graphviz")
+       if(EXISTS "/usr/local/include/graphviz")
+               set(include_graphviz "/usr/local/include/graphviz")
+       endif(EXISTS "/usr/local/include/graphviz")
+       
+       set(CGRAPH_PATH ${include_graphviz} CACHE PATH "Path to cgraph.h")
 endif(APPLE AND NOT CGRAPH_PATH)
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")