From bfded142dc88f72fb1a1f7b8411413e294da0116 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 17 Nov 2010 17:20:42 +0000 Subject: [PATCH] Make example dot if graphviz is enable and if it is possible. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8571 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/CompleteInFiles.cmake | 6 ++++++ buildtools/Cmake/MakeExeLib.cmake | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 7c52b2344d..7d9d66bdb2 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -237,8 +237,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 diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index f887c3e04b..212e7fe74e 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -195,9 +195,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax) -if(HAVE_CGRAPH_H AND enable_graphviz) +if(enable_graphviz) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot) -endif(HAVE_CGRAPH_H AND enable_graphviz) +endif(enable_graphviz) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling) -- 2.20.1