Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Change Name CGRPAH by CGRAPH.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 5 Jul 2010 08:41:01 +0000 (08:41 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 5 Jul 2010 08:41:01 +0000 (08:41 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7964 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/Option.cmake

index 196c6b1..7e3e2ac 100644 (file)
@@ -3,7 +3,7 @@ include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 
-set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${CGRPAH_PATH}")
+set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${CGRAPH_PATH}")
 
 # Checks for header libraries functions.
 
@@ -205,7 +205,7 @@ endif(enable_java)
 ### Initialize of cgraph
 
 if(HAVE_CGRAPH_H)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${CGRPAH_PATH} ")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${CGRAPH_PATH} ")
 endif(HAVE_CGRAPH_H)
 
 #--------------------------------------------------------------------------------------------------
index ebdcade..a3e2766 100644 (file)
@@ -1,11 +1,11 @@
 ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after)
 ### ex: cmake -Denable_java=ON -Denable_gtnets=ON ./
 
-if(APPLE AND NOT CGRPAH_PATH)
-       set(CGRPAH_PATH "/opt/local/include/graphviz" CACHE PATH "Path to cgraph.h")
-else(APPLE AND NOT CGRPAH_PATH)
-       set(CGRPAH_PATH "/usr/include/graphviz" CACHE PATH "Path to cgraph.h")
-endif(APPLE AND NOT CGRPAH_PATH)
+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")
+endif(APPLE AND NOT CGRAPH_PATH)
 
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib")