A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
buildtools
/
Cmake
/
DefinePackages.cmake
diff --git
a/buildtools/Cmake/DefinePackages.cmake
b/buildtools/Cmake/DefinePackages.cmake
index
580659d
..
6378849
100644
(file)
--- a/
buildtools/Cmake/DefinePackages.cmake
+++ b/
buildtools/Cmake/DefinePackages.cmake
@@
-91,6
+91,14
@@
set(EXTRA_DIST
src/smpi/smpi_mpi_dt_private.h
src/smpi/README
src/mk_supernovae.pl
src/smpi/smpi_mpi_dt_private.h
src/smpi/README
src/mk_supernovae.pl
+
+ examples/gras/ping/ping.h
+ examples/gras/console/ping.h
+ examples/gras/mmrpc/mmrpc.h
+
+ tools/gras/gras_stub_generator.h
+ tools/tesh/run_context.h
+ tools/tesh/tesh.h
)
set(XBT_RL_SRC
)
set(XBT_RL_SRC
@@
-184,6
+192,12
@@
set(GTNETS_SRC
src/surf/network_gtnets.c
)
src/surf/network_gtnets.c
)
+set(NS3_SRC
+ src/surf/network_ns3.c
+ src/surf/ns3/ns3_interface.cc
+ src/surf/ns3/ns3_simulator.cc
+ )
+
set(SURF_SRC
src/surf/surf_model.c
src/surf/surf_action.c
set(SURF_SRC
src/surf/surf_model.c
src/surf/surf_action.c
@@
-313,8
+327,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_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
src/instr/instr_surf.c
src/instr/instr_smpi.c
src/instr/instr_simdag.c
@@
-350,7
+362,7
@@
set(RNGSTREAM_SRC
src/rngstreams/RngStream.c
)
src/rngstreams/RngStream.c
)
-set(
install_HEADERS
+set(
headers_to_install
include/xbt/misc.h
include/xbt/sysdep.h
include/xbt/virtu.h
include/xbt/misc.h
include/xbt/sysdep.h
include/xbt/virtu.h
@@
-370,6
+382,7
@@
set(install_HEADERS
include/xbt/graph.h
include/xbt/fifo.h
include/xbt/swag.h
include/xbt/graph.h
include/xbt/fifo.h
include/xbt/swag.h
+ include/xbt/lib.h
include/xbt/matrix.h
include/xbt/peer.h
include/xbt/config.h
include/xbt/matrix.h
include/xbt/peer.h
include/xbt/config.h
@@
-390,11
+403,12
@@
set(install_HEADERS
include/simdag/simdag.h
include/simdag/datatypes.h
include/smpi/smpi.h
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/smpi/mpi.h
include/smpi/mpif.h
+ include/smpi/smpi_cocci.h
include/surf/surfxml_parse.h
include/surf/simgrid_dtd.h
include/surf/surfxml_parse.h
include/surf/simgrid_dtd.h
+ include/surf/surf_routing.h
include/gras/datadesc.h
include/gras/transport.h
include/gras/virtu.h
include/gras/datadesc.h
include/gras/transport.h
include/gras/virtu.h
@@
-406,13
+420,16
@@
set(install_HEADERS
include/amok/peermanagement.h
include/amok/bandwidth.h
include/instr/instr.h
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
)
include/gras.h
include/xbt.h
include/simix/simix.h
include/simix/datatypes.h
include/simix/context.h
)
+set(source_of_generated_headers
+ include/simgrid_config.h.in
+ include/smpi/smpif.h.in
+ src/context_sysv_config.h.in)
### depend of some variables setted upper
# -->CONTEXT_THREADS CONTEXT_UCONTEXT
### depend of some variables setted upper
# -->CONTEXT_THREADS CONTEXT_UCONTEXT
@@
-478,6
+495,13
@@
if(HAVE_MC)
)
endif(HAVE_MC)
)
endif(HAVE_MC)
+if(HAVE_NS3)
+ set(simgrid_sources
+ ${simgrid_sources}
+ ${NS3_SRC}
+ )
+endif(HAVE_NS3)
+
# WINDOWS
if(WIN32)
set(simgrid_sources
# WINDOWS
if(WIN32)
set(simgrid_sources
@@
-527,6
+551,7
@@
set(DOC_SOURCES
doc/gtut-howto.doc
doc/gtut-introduction.doc
doc/gtut-main.doc
doc/gtut-howto.doc
doc/gtut-introduction.doc
doc/gtut-main.doc
+ doc/gtut-tour-00-install.doc
doc/gtut-tour-01-bones.doc
doc/gtut-tour-02-simple.doc
doc/gtut-tour-03-args.doc
doc/gtut-tour-01-bones.doc
doc/gtut-tour-02-simple.doc
doc/gtut-tour-03-args.doc
@@
-600,6
+625,7
@@
set(DOC_SOURCES
doc/webcruft/robots.txt
doc/webcruft/simgrid_logo.png
doc/webcruft/simgrid_logo_small.png
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
doc/triva-graph_configuration.png
doc/triva-graph_visualization.png
doc/simgrid.css
@@
-660,17
+686,6
@@
set(add_src_files
src/simix/smx_context_sysv_private.h
)
src/simix/smx_context_sysv_private.h
)
-file(GLOB_RECURSE include_files
-"include/*.h"
-"teshsuite/*.h"
-"testsuite/*.h"
-"tools/*.h"
-"examples/*.h"
-"examples/*.hpp"
-"src/*.h.in"
-"include/*.h.in"
-)
-
file(GLOB_RECURSE xml_files
"examples/*.xml"
"include/*.xml"
file(GLOB_RECURSE xml_files
"examples/*.xml"
"include/*.xml"
@@
-694,13
+709,8
@@
set(txt_files
"testsuite/surf/trace_A.txt"
"testsuite/surf/trace_B.txt"
"examples/smpi/hostfile"
"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/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"
"examples/msg/fafard_state.trace"
"examples/msg/jupiter_state.trace"
"examples/msg/actions/actions_allReduce.txt"
@@
-727,6
+737,9
@@
set(txt_files
"teshsuite/simdag/platforms/bob.fail"
"teshsuite/simdag/platforms/bob.trace"
"teshsuite/simdag/platforms/bob0_availability_file.trace"
"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"
"teshsuite/simdag/platforms/link1.bw"
"teshsuite/simdag/platforms/link1.fail"
"teshsuite/simdag/platforms/link1.lat"
@@
-802,7
+815,8
@@
buildtools/Cmake/tesh.pl
# This is the complete list of what will be added to the source archive
set(source_to_pack
# This is the complete list of what will be added to the source archive
set(source_to_pack
- ${install_HEADERS}
+ ${headers_to_install}
+ ${source_of_generated_headers}
${XBT_RL_SRC}
${EXTRA_DIST}
${SMPI_SRC}
${XBT_RL_SRC}
${EXTRA_DIST}
${SMPI_SRC}
@@
-822,7
+836,6
@@
set(source_to_pack
${JEDULE_SRC}
${RNGSTREAM_SRC}
${add_src_files}
${JEDULE_SRC}
${RNGSTREAM_SRC}
${add_src_files}
- ${include_files}
${xml_files}
${tesh_files}
${txt_files}
${xml_files}
${tesh_files}
${txt_files}