X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0c8ef0b005883c27465faaf974353b5184d9274..9cc5dac9b02b2bf4f7a01e27642b0e6060877dd1:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index c3d88816d4..994ef8372e 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -99,6 +99,12 @@ 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
+	src/surf/ns3/red-queue.h
 )
 
 set(XBT_RL_SRC 
@@ -196,8 +202,10 @@ set(NS3_SRC
 	src/surf/network_ns3.c
 	src/surf/ns3/ns3_interface.cc
 	src/surf/ns3/ns3_simulator.cc
-	)
-
+	src/surf/ns3/red-queue.cc
+	src/surf/ns3/my-point-to-point-helper.cc
+)
+	
 set(SURF_SRC 
 	src/surf/surf_model.c
 	src/surf/surf_action.c
@@ -362,7 +370,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
@@ -431,11 +439,6 @@ set(source_of_generated_headers
 	include/smpi/smpif.h.in
 	src/context_sysv_config.h.in)
 
-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
 if(${CONTEXT_THREADS}) #pthread
@@ -549,9 +552,31 @@ 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/pls.doc
 	doc/gtut-howto-design.doc
 	doc/gtut-howto.doc
 	doc/gtut-introduction.doc
@@ -575,7 +600,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
@@ -585,8 +610,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
@@ -627,10 +650,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
@@ -638,13 +659,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
 )
 
@@ -656,10 +675,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"
@@ -820,7 +835,7 @@ 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}
@@ -828,6 +843,7 @@ set(source_to_pack
 	${GRAS_RL_SRC}
 	${XBT_SRC}
 	${GTNETS_SRC}
+	${NS3_SRC}
 	${SURF_SRC}
 	${SIMIX_SRC}
 	${TRACING_SRC}
@@ -847,7 +863,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 
 )