X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3dabc5eb26d7bc8b1e29b3aa52c74368c6bb699..2cc20f1526f80e1c731e986a50c5b77fa7e223d8:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index db5d97f2c3..544ddcebca 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -91,6 +91,18 @@ set(EXTRA_DIST
 	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
+	
+	src/surf/network_ns3_private.h
+	src/surf/ns3/ns3_interface.h
+	src/surf/ns3/ns3_simulator.h
 )
 
 set(XBT_RL_SRC 
@@ -187,6 +199,7 @@ set(GTNETS_SRC
 set(NS3_SRC
 	src/surf/network_ns3.c
 	src/surf/ns3/ns3_interface.cc
+	src/surf/ns3/ns3_simulator.cc
 	)
 
 set(SURF_SRC 
@@ -318,8 +331,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
@@ -355,7 +366,7 @@ set(RNGSTREAM_SRC
 	src/rngstreams/RngStream.c
 )
 
-set(install_HEADERS
+set(headers_to_install
 	include/xbt/misc.h
 	include/xbt/sysdep.h
 	include/xbt/virtu.h
@@ -375,6 +386,7 @@ set(install_HEADERS
 	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
@@ -395,11 +407,12 @@ 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/smpi/smpi_cocci.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
@@ -411,13 +424,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(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
@@ -535,6 +551,12 @@ file(GLOB_RECURSE examples_to_install_in_doc
 set(DOC_SOURCES
 	doc/contrib.doc
 	doc/FAQ.doc
+	doc/installSimgrid.doc
+	doc/bindings.doc
+	doc/options.doc
+	doc/use.doc
+	doc/gtnets.doc
+	doc/ns3.doc
 	doc/gtut-howto-design.doc
 	doc/gtut-howto.doc
 	doc/gtut-introduction.doc
@@ -613,6 +635,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
@@ -673,17 +696,6 @@ set(add_src_files
 	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"
@@ -707,13 +719,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"
@@ -740,6 +747,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"
@@ -815,13 +825,15 @@ buildtools/Cmake/tesh.pl
 
 # 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}
 	${GRAS_RL_SRC}
 	${XBT_SRC}
 	${GTNETS_SRC}
+	${NS3_SRC}
 	${SURF_SRC}
 	${SIMIX_SRC}
 	${TRACING_SRC}
@@ -835,7 +847,6 @@ set(source_to_pack
 	${JEDULE_SRC}
 	${RNGSTREAM_SRC}
 	${add_src_files}
-	${include_files}
 	${xml_files}
 	${tesh_files}
 	${txt_files}
@@ -845,4 +856,5 @@ set(source_to_pack
 	${DOC_FIGS}
 	${DOC_bib}
 	${README_files}
+	buildtools/Cmake/simgrid.nsi.in 
 )