X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11d3d193d6035bcf8c532d3852d86e10062c2622..1669c814e945dbc5b33dde12192cb347705f49e9:/buildtools/Cmake/MakeExeLib.cmake

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index d39ebc27fb..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,9 +55,13 @@ 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_LIB AND HAVE_CGRAPH_H)
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
+endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
+
 if(HAVE_GTNETS)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
@@ -71,6 +75,10 @@ target_link_libraries(simgrid 	${SIMGRID_DEP})
 target_link_libraries(simgrid_static	${SIMGRID_DEP})
 target_link_libraries(gras 	${GRAS_DEP})
 
+add_dependencies(gras maintainer_files)
+add_dependencies(simgrid maintainer_files)
+add_dependencies(simgrid_static maintainer_files)
+				
 if(enable_smpi)
 	target_link_libraries(smpi 	simgrid ${SMPI_DEP})
 endif(enable_smpi)
@@ -132,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)
@@ -147,9 +156,12 @@ 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)
 if(enable_smpi)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
-endif(enable_smpi)
\ No newline at end of file
+endif(enable_smpi)