Make example dot if graphviz is enable.

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
old mode 100755 (executable)
new mode 100644 (file)
index 2b5b50b..9019eaa
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -240,9 +240,9 @@ set(SIMIX_SRC
        src/simix/smx_deployment.c
        src/simix/smx_environment.c
        src/simix/smx_host.c
+       src/simix/smx_action.c
        src/simix/smx_process.c
        src/simix/smx_context.c
-       src/simix/smx_action.c
        src/simix/smx_synchro.c
        src/simix/smx_network.c
        src/simix/smx_context_base.c
@@ -268,13 +268,12 @@ set(SIMDAG_SRC
        src/simdag/sd_workstation.c
        src/simdag/sd_daxloader.c
 )
-if(HAVE_CGRAPH_H)
-       set(SIMDAG_SRC
-               ${SIMDAG_SRC}
+if(GRAPH_H OR AGRAPH_H OR CGRAPH_H)
+       set(SIMDAG_SRC 
+           ${SIMDAG_SRC}
                src/simdag/sd_dotloader.c
        )
-
-endif(HAVE_CGRAPH_H)
+endif(GRAPH_H OR AGRAPH_H OR CGRAPH_H)
 
 set(GRAS_COMMON_SRC
        src/gras/gras.c
@@ -322,6 +321,7 @@ set(LUA_SRC
        src/simix/smx_context_lua.c
        src/bindings/lua/simgrid_lua.c
        src/bindings/lua/lua_stub_generator.c
+       src/bindings/lua/lua_console.c
 )
 
 set(TRACING_SRC
@@ -336,7 +336,9 @@ set(TRACING_SRC
        src/instr/smx_instr.c
        src/instr/surf_instr.c
        src/instr/smpi_instr.c
+       src/instr/sd_instr.c
        src/instr/variables_instr.c
+       src/instr/resource_utilization.c
        src/instr/private.h
 )
 
@@ -411,7 +413,7 @@ include/gras/timer.h
 include/amok/peermanagement.h
 include/amok/bandwidth.h
 include/instr/instr.h
-include/simgrid_config.h
+${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
 include/gras.h 
 include/xbt.h
 )
@@ -746,10 +748,6 @@ set(bin_files
 tools/MSG_visualization/colorize.pl
 )
 
-file(GLOB_RECURSE doc_files
-"doc/html/*"
-)
-
 # This is the complete lise of what will be added to the source archive
 set(source_to_pack     
        ${XBT_RL_SRC}
@@ -780,5 +778,4 @@ set(source_to_pack
        ${EXTRA_DIST}
        ${CMAKE_SOURCE_FILES}
        ${bin_files}
-       ${doc_files}
 )