merge

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 5f8b14e..d65e466 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -319,8 +319,6 @@ set(TRACING_SRC
        src/instr/instr_paje_trace.c
        src/instr/instr_msg_task.c
        src/instr/instr_msg_process.c
-       src/instr/instr_msg_volume.c
-       src/instr/instr_smx.c
        src/instr/instr_surf.c
        src/instr/instr_smpi.c
        src/instr/instr_simdag.c
@@ -396,7 +394,6 @@ set(install_HEADERS
        include/simdag/simdag.h
        include/simdag/datatypes.h
        include/smpi/smpi.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
        include/smpi/mpi.h
        include/smpi/mpif.h
        include/surf/surfxml_parse.h
@@ -413,13 +410,16 @@ set(install_HEADERS
        include/amok/peermanagement.h
        include/amok/bandwidth.h
        include/instr/instr.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
        include/gras.h 
        include/xbt.h
        include/simix/simix.h
        include/simix/datatypes.h
        include/simix/context.h
 )
+set(GENERATE_HEADERS
+       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
+       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
+)
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
@@ -615,6 +615,7 @@ set(DOC_SOURCES
        doc/webcruft/robots.txt
        doc/webcruft/simgrid_logo.png
        doc/webcruft/simgrid_logo_small.png
+       doc/webcruft/fish.gif
        doc/triva-graph_configuration.png
        doc/triva-graph_visualization.png
        doc/simgrid.css
@@ -709,13 +710,8 @@ set(txt_files
 "testsuite/surf/trace_A.txt"
 "testsuite/surf/trace_B.txt"
 "examples/smpi/hostfile"
-"examples/msg/procmig.trace"
-"examples/msg/volume.trace"
-"examples/msg/ms.trace"
 "examples/msg/trace/file.trace"
 "examples/msg/link5_state.trace"
-"examples/msg/categories.trace"
-"examples/msg/tasks.trace"
 "examples/msg/fafard_state.trace"
 "examples/msg/jupiter_state.trace"
 "examples/msg/actions/actions_allReduce.txt"
@@ -742,6 +738,9 @@ set(txt_files
 "teshsuite/simdag/platforms/bob.fail"
 "teshsuite/simdag/platforms/bob.trace"
 "teshsuite/simdag/platforms/bob0_availability_file.trace"
+"teshsuite/simdag/platforms/bob0_state_file.trace"
+"teshsuite/simdag/platforms/bob2_availability_file.trace"
+"teshsuite/simdag/platforms/bob2_state_file.trace"
 "teshsuite/simdag/platforms/link1.bw"
 "teshsuite/simdag/platforms/link1.fail"
 "teshsuite/simdag/platforms/link1.lat"