X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4970c3abeb220bd31ca24d1c4c6b28942abb46b9..b6ec60a26d8c59cfb51b74d6bc1b9fb85b0ac0c4:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 9752407cbf..8375a45ac3 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -184,6 +184,12 @@ set(GTNETS_SRC
 	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
@@ -390,11 +396,11 @@ 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
 	include/surf/simgrid_dtd.h
+	include/surf/surf_routing.h
 	include/gras/datadesc.h
 	include/gras/transport.h
 	include/gras/virtu.h
@@ -406,13 +412,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
@@ -478,6 +487,13 @@ if(HAVE_MC)
 		)
 endif(HAVE_MC)
 
+if(HAVE_NS3)
+	set(simgrid_sources
+		${simgrid_sources}
+		${NS3_SRC}
+	)
+endif(HAVE_NS3)
+
 # WINDOWS
 if(WIN32)
 	set(simgrid_sources
@@ -527,6 +543,7 @@ set(DOC_SOURCES
 	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
@@ -600,6 +617,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
@@ -694,13 +712,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"
@@ -726,6 +739,10 @@ set(txt_files
 "teshsuite/gras/small_sleep/test_sg_64.tesh"
 "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"