Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Kill enable_graphviz cmake variable
[simgrid.git] / buildtools / Cmake / MakeExeLib.cmake
index 54e1388..38c5134 100644 (file)
@@ -84,8 +84,7 @@ if(HAVE_LUA)
        )
 endif(HAVE_LUA)
 
-if(enable_graphviz AND HAVE_CDT_LIB)
-if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
+if(HAVE_GRAPHVIZ)
 
     if(HAVE_CGRAPH_LIB)
            SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
@@ -95,8 +94,7 @@ if(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
         endif(HAVE_AGRAPH_LIB) 
     endif(HAVE_CGRAPH_LIB)
            
-endif(HAVE_AGRAPH_H OR HAVE_CGRAPH_H)
-endif(enable_graphviz AND HAVE_CDT_LIB)
+endif(HAVE_GRAPHVIZ)
 
 if(HAVE_GTNETS)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
@@ -199,9 +197,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
 
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
-if(enable_graphviz)
-add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
-endif(enable_graphviz)
+if(HAVE_GRAPHVIZ)
+  add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot)
+endif(HAVE_GRAPHVIZ)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)