X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00b8b9a6c24efa391b997f26d5ff6d2dfd0b0dd1..1669c814e945dbc5b33dde12192cb347705f49e9:/buildtools/Cmake/MakeExeLib.cmake diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index 0b0c5264f8..1bd3ded66f 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -30,7 +30,7 @@ if(HAVE_RUBY) COMMENT "Generating libsimgrid.so link for binding ruby..." ) ADD_CUSTOM_TARGET(link_simgrid_ruby ALL - DEPENDS ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so) + DEPENDS simgrid ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so) endif(HAVE_RUBY) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -55,12 +55,12 @@ if(HAVE_LUA) COMMENT "Generating libsimgrid.so link for binding lua..." ) ADD_CUSTOM_TARGET(link_simgrid_lua ALL - DEPENDS ${PROJECT_DIRECTORY}/examples/lua/simgrid.so) + DEPENDS simgrid ${PROJECT_DIRECTORY}/examples/lua/simgrid.so) endif(HAVE_LUA) -if(HAVE_CGRAPH_H) +if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H) SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph") -endif(HAVE_CGRAPH_H) +endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H) if(HAVE_GTNETS) SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets") @@ -140,6 +140,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/tracing) +add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/icomms) if(HAVE_MC) add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/mc) @@ -155,7 +156,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) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot) +endif(HAVE_CGRAPH_H) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling)