X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdab308abd979bdc3d7116937c07ca1fe1f6f982..0c62ac293213c4632f158a2cbedc86e321a324d4:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 63788493a3..62b7b4ea34 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -99,6 +99,11 @@ set(EXTRA_DIST
 	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
+	src/surf/ns3/my-point-to-point-helper.h
 )
 
 set(XBT_RL_SRC 
@@ -197,6 +202,18 @@ set(NS3_SRC
 	src/surf/ns3/ns3_interface.cc
 	src/surf/ns3/ns3_simulator.cc
 	)
+	
+if(HAVE_RED_QUEUE_H)
+    set(NS3_SRC
+        ${NS3_SRC}
+        src/surf/ns3/my-point-to-point-helper.cc
+        )
+else(HAVE_RED_QUEUE_H)
+	set(EXTRA_DIST
+	    ${EXTRA_DIST}
+	    src/surf/ns3/my-point-to-point-helper.cc
+	)
+endif(HAVE_RED_QUEUE_H)
 
 set(SURF_SRC 
 	src/surf/surf_model.c
@@ -544,9 +561,32 @@ file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*README"
 )
 
+set(WEBSITE_SOURCES
+    website/contrib.doc
+    website/FAQ.doc
+    website/history.doc
+	website/people.doc	
+	website/publis.doc  
+	website/all.bib
+	website/Doxyfile_website.in
+	website/footer.html
+	website/index.php.in
+	website/download.php.in
+	website/documentation.php.in
+    
+    tools/doxygen/bibtex2html_table_count.pl
+	doc/webcruft/fish.gif
+	doc/webcruft/robots.txt
+	)
+    
 set(DOC_SOURCES
-	doc/contrib.doc
-	doc/FAQ.doc
+	doc/installSimgrid.doc
+	doc/bindings.doc
+	doc/options.doc
+	doc/use.doc
+	doc/tracing.doc
+	doc/gtnets.doc
+	doc/ns3.doc
 	doc/gtut-howto-design.doc
 	doc/gtut-howto.doc
 	doc/gtut-introduction.doc
@@ -570,7 +610,7 @@ set(DOC_SOURCES
 	doc/gtut-tour-16-exchangecb.doc
 	doc/gtut-tour.doc
 	doc/gtut-tour-recap-messages.doc
-	doc/history.doc
+	
 	#doc/index-API.doc
 	doc/index.doc
 	doc/module-amok.doc
@@ -580,8 +620,6 @@ set(DOC_SOURCES
 	doc/modules.doc
 	doc/module-surf.doc
 	doc/module-xbt.doc
-	doc/people.doc	
-	doc/publis.doc
 	
 	doc/gtut-files/01-bones.c
 	doc/gtut-files/01-bones.output
@@ -622,10 +660,8 @@ set(DOC_SOURCES
 	doc/webcruft/Paje_MSG_screenshot.jpg
 	doc/webcruft/Paje_MSG_screenshot_thn.jpg
 	doc/webcruft/poster_thumbnail.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
@@ -633,13 +669,11 @@ set(DOC_SOURCES
 	doc/Doxyfile.in
 	doc/footer.html.in
 	
-	tools/doxygen/bibtex2html_table_count.pl
 	tools/doxygen/doxygen_postprocesser.pl
 	tools/doxygen/index_create.pl
 	tools/doxygen/toc_create.pl
 	tools/doxygen/bibtex2html_wrapper.pl
 	tools/doxygen/fig2dev_postprocessor.pl
-	tools/doxygen/index_php.pl
 	tools/doxygen/xbt_log_extract_hierarchy.pl
 )
 
@@ -651,10 +685,6 @@ set(DOC_FIGS
 	${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
-set(DOC_bib
-	${CMAKE_HOME_DIRECTORY}/doc/all.bib
-)
-
 file(GLOB_RECURSE add_src_files
 "teshsuite/*.c"
 "teshsuite/*.cxx"
@@ -823,6 +853,7 @@ set(source_to_pack
 	${GRAS_RL_SRC}
 	${XBT_SRC}
 	${GTNETS_SRC}
+	${NS3_SRC}
 	${SURF_SRC}
 	${SIMIX_SRC}
 	${TRACING_SRC}
@@ -842,7 +873,8 @@ set(source_to_pack
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
 	${DOC_SOURCES}
+	${WEBSITE_SOURCES}
 	${DOC_FIGS}
-	${DOC_bib}
 	${README_files}
+	buildtools/Cmake/simgrid.nsi.in 
 )