X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c0ad37fd1f1e21ede5c8ff97e805f9855698424..020cbee0530ccdfaef033bec1ff205560f48c0bc:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 5f4102b6c3..34e8283f52 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1,6 +1,7 @@
 ### define source packages
 
 set(EXTRA_DIST
+  src/include/smpi/smpi_interface.h
   src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
@@ -93,6 +94,7 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
+  src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
   src/smpi/smpi_c99.c
@@ -105,7 +107,7 @@ set(SMPI_SRC
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
   )
-  
+
 if(SMPI_F2C)
   set(SMPI_SRC
     ${SMPI_SRC}
@@ -186,6 +188,8 @@ set(SURF_SRC
   src/surf/cpu_cas01.c
   src/surf/cpu_ti.c
   src/surf/fair_bottleneck.c
+  src/surf/instr_routing.c
+  src/surf/instr_surf.c
   src/surf/lagrange.c
   src/surf/maxmin.c
   src/surf/network.c
@@ -235,8 +239,10 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
+  src/msg/instr_msg_process.c
+  src/msg/instr_msg_task.c
+  src/msg/instr_msg_vm.c
   src/msg/msg_actions.c
-  src/msg/msg_config.c
   src/msg/msg_deployment.c
   src/msg/msg_environment.c
   src/msg/msg_global.c
@@ -318,8 +324,6 @@ set(LUA_SRC
 set(TRACING_SRC
   src/instr/instr_config.c
   src/instr/instr_interface.c
-  src/instr/instr_msg_process.c
-  src/instr/instr_msg_task.c
   src/instr/instr_paje_containers.c
   src/instr/instr_paje_trace.c
   src/instr/instr_paje_header.c
@@ -327,9 +331,6 @@ set(TRACING_SRC
   src/instr/instr_paje_values.c
   src/instr/instr_private.h
   src/instr/instr_resource_utilization.c
-  src/instr/instr_routing.c
-  src/instr/instr_smpi.c
-  src/instr/instr_surf.c
   )
 
 set(JEDULE_SRC
@@ -461,7 +462,6 @@ endif()
 set(simgrid_sources
   ${BINDINGS_SRC}
   ${GTNETS_USED}
-  ${JEDULE_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
@@ -471,6 +471,30 @@ set(simgrid_sources
   ${XBT_SRC}
   )
 
+if(${HAVE_JEDULE})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${JEDULE_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${JEDULE_SRC}
+    )
+endif()
+
+if(${HAVE_TRACING})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${TRACING_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${TRACING_SRC}
+    )
+endif()
+
 if(HAVE_MC)
   set(simgrid_sources
     ${simgrid_sources}
@@ -509,52 +533,66 @@ endif()
 
 set(DOC_SOURCES
   doc/AS_hierarchy.png
+  doc/Doxyfile.in
+  doc/Layout.xml
   doc/sg_thread_model.fig
   doc/simix.fig
   doc/surf_nutshell.fig
-  doc/Doxyfile.in
-  doc/Layout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png
   doc/triva-time_interval.png
-  
-    doc/doxygen/footer.html
-  doc/doxygen/header.html
-  doc/doxygen/stylesheet.css
-  
-  doc/doxygen/index.doc
-  doc/doxygen/getting_started.doc  
-  doc/doxygen/introduction.doc
-  doc/doxygen/use.doc
+
+  doc/doxygen/FAQ.doc
+  doc/doxygen/advanced.doc
   doc/doxygen/bindings.doc
+  doc/doxygen/contributing.doc
   doc/doxygen/deployment.doc
+  doc/doxygen/footer.html
+  doc/doxygen/getting_started.doc
+  doc/doxygen/header.html
+  doc/doxygen/index.doc
+  doc/doxygen/inside_autotests.doc
+  doc/doxygen/inside_cmake.doc
+  doc/doxygen/inside_extending.doc
+  doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
+  doc/doxygen/introduction.doc
+  doc/doxygen/module-msg.doc
+  doc/doxygen/module-sd.doc
+  doc/doxygen/module-simix.doc
+  doc/doxygen/module-surf.doc
+  doc/doxygen/module-trace.doc
+  doc/doxygen/module-xbt.doc
+  doc/doxygen/modules.doc
   doc/doxygen/options.doc
   doc/doxygen/platform.doc
   doc/doxygen/pls.doc
+  doc/doxygen/stylesheet.css
   doc/doxygen/tracing.doc
-  doc/doxygen/FAQ.doc
-  doc/doxygen/advanced.doc
-    doc/doxygen/inside_autotests.doc  
-    doc/doxygen/inside_cmake.doc
-    doc/doxygen/inside_extending.doc 
-    doc/doxygen/inside_release.doc
-    doc/doxygen/contributing.doc
-  doc/doxygen/modules.doc
-    doc/doxygen/module-msg.doc
-    doc/doxygen/module-sd.doc
-    doc/doxygen/module-simix.doc
-    doc/doxygen/module-surf.doc
-    doc/doxygen/module-trace.doc
-    doc/doxygen/module-xbt.doc
+  doc/doxygen/use.doc
 
+  doc/msg-tuto-src/deployment0.xml
+  doc/msg-tuto-src/deployment1.xml
+  doc/msg-tuto-src/deployment2.xml
+  doc/msg-tuto-src/deployment3.xml
+  doc/msg-tuto-src/deployment_general.xml
+  doc/msg-tuto-src/masterworker0.c
+  doc/msg-tuto-src/masterworker1.c
+  doc/msg-tuto-src/masterworker2.c
+  doc/msg-tuto-src/masterworker3.c
+  doc/msg-tuto-src/masterworker4.c
+  doc/msg-tuto-src/platforms/cloud.xml
+  doc/msg-tuto-src/platforms/g5k.xml
+  doc/msg-tuto-src/platforms/griffon.xml
+  doc/msg-tuto-src/platforms/peers.xml
+  doc/msg-tuto-src/platforms/platform.xml
   )
 
 set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
-  
+
 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
@@ -564,6 +602,7 @@ set(DOC_TOOLS
 # these files get copied automatically to the html documentation
 set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css
+  ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
@@ -733,6 +772,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_thread_storage.c
   buildtools/Cmake/test_prog/prog_va_copy.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
+  buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
   )
 
 set(PLATFORMS_EXAMPLES