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 ddeb0e4..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
@@ -321,10 +320,13 @@ set(AMOK_SRC
 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
        src/instr/instr_config.c
+       src/instr/categories.c
        src/instr/interface.c
        src/instr/general.c
        src/instr/paje.c
@@ -333,7 +335,10 @@ set(TRACING_SRC
        src/instr/msg_volume.c
        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
 )
 
@@ -408,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
 )
@@ -443,7 +448,7 @@ src/xbt/xbt_synchro.c
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
-if(${CONTEXT_THREADS} OR WIN32)
+if(${CONTEXT_THREADS}) #pthread
        set(SURF_SRC
                ${SURF_SRC}
                src/xbt/xbt_os_thread.c
@@ -453,17 +458,27 @@ if(${CONTEXT_THREADS} OR WIN32)
                ${EXTRA_DIST}
                src/simix/smx_context_sysv.c
        )
-else(${CONTEXT_THREADS} OR WIN32)
+else(${CONTEXT_THREADS}) #ucontext
        set(SURF_SRC
                ${SURF_SRC}
                src/simix/smx_context_sysv.c
        )
-       set(EXTRA_DIST
-               ${EXTRA_DIST}
-               src/xbt/xbt_os_thread.c
-               src/simix/smx_context_thread.c
-       )
-endif(${CONTEXT_THREADS} OR WIN32)
+
+       if(WIN32)
+       set(SURF_SRC
+               ${SURF_SRC}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    else(WIN32)
+       set(EXTRA_DIST
+               ${EXTRA_DIST}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    endif(WIN32)
+endif(${CONTEXT_THREADS})
+
+
+
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -733,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}
@@ -767,5 +778,4 @@ set(source_to_pack
        ${EXTRA_DIST}
        ${CMAKE_SOURCE_FILES}
        ${bin_files}
-       ${doc_files}
 )