X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9889deb10c0b29c3c5a2ae25ac0c4b9e25e8334e..baa5228d37e11eea729a2e31acfe1022171eee45:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 9c8456df00..3579675e39 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -40,6 +40,7 @@ set(EXTRA_DIST
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h
   src/surf/cpu_ti_private.h
+  src/surf/platf_generator_private.h
   src/surf/gtnets/gtnets_interface.h
   src/surf/gtnets/gtnets_simulator.h
   src/surf/gtnets/gtnets_topology.h
@@ -90,7 +91,6 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmprivate.h
   src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
-  src/xbt/mmalloc/test/mmalloc_test.c
   src/xbt/setset_private.h
   tools/gras/gras_stub_generator.h
   tools/tesh/run_context.h
@@ -113,7 +113,6 @@ set(SMPI_SRC
   src/smpi/smpi_c99.c
   src/smpi/smpi_coll.c
   src/smpi/smpi_comm.c
-  src/smpi/smpi_f77.c
   src/smpi/smpi_global.c
   src/smpi/smpi_group.c
   src/smpi/smpi_mpi.c
@@ -121,6 +120,13 @@ set(SMPI_SRC
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
   )
+  
+if(SMPI_F2C)
+  set(SMPI_SRC
+    ${SMPI_SRC}
+    src/smpi/smpi_f77.c
+    )
+endif(SMPI_F2C)
 
 set(GRAS_RL_SRC
   ${XBT_RL_SRC}
@@ -217,6 +223,7 @@ set(SURF_SRC
   src/surf/maxmin.c
   src/surf/network.c
   src/surf/network_constant.c
+  src/surf/platf_generator.c
   src/surf/random_mgr.c
   src/surf/sg_platf.c
   src/surf/storage.c
@@ -298,16 +305,10 @@ set(SURF_SRC
   )
 set(EXTRA_DIST
   ${EXTRA_DIST}
-  src/surf/new_model_private.c
+  src/surf/new_model_private.h
   )
 #* ****************************************************************************************** *#
 
-set(PLATFGEN_SRC
-  include/simgrid/platf_generator.h
-  src/surf/platf_generator.c
-  src/surf/platf_generator_private.h
-  )
-
 set(SIMDAG_SRC
   src/simdag/sd_daxloader.c
   src/simdag/sd_global.c
@@ -548,7 +549,6 @@ set(simgrid_sources
   ${SIMDAG_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
-  ${PLATFGEN_SRC}
   ${TRACING_SRC}
   ${XBT_SRC}
   )
@@ -598,24 +598,80 @@ else(${HAVE_LUA})
 endif(${HAVE_LUA})
 
 set(DOC_SOURCES
+  doc/amok_bw_sat.png
+  doc/amok_bw_test.png
+  doc/AS_hierarchy.png
+  doc/gras_comm.png
+  doc/sg_thread_model.fig
+  doc/simix.fig
+  doc/surf_nutshell.fig
   doc/Doxyfile.in
   doc/FAQ.doc
   doc/index.doc
   doc/simgrid.css
+  doc/SimgridDoxygenLayout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png
-  doc/webcruft/Paje_MSG_screenshot.jpg
-  doc/webcruft/Paje_MSG_screenshot_thn.jpg
-  doc/webcruft/awstats_logo3.png
-  doc/webcruft/poster_thumbnail.png
-  doc/webcruft/simgrid_logo_2011.png
-  doc/webcruft/simgrid_logo_2011_small.png
+  doc/triva-time_interval.png
+  )
+
+set(DOC_FIGS
+  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
+  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
+  )
+  
+set(DOC_SHARED_TAG
+  doc/shared/doxygen/simgriddevguide.tag
+  doc/shared/doxygen/simgridrefguide.tag
+  doc/shared/doxygen/simgriduserguide.tag
+  )
+  
+set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
   )
 
+set(DOC_GTUT_SRC
+  doc/gtut-files/01-bones.c
+  doc/gtut-files/01-bones.output
+  doc/gtut-files/02-simple.c
+  doc/gtut-files/02-simple.output
+  doc/gtut-files/03-args.c
+  doc/gtut-files/03-args.output
+  doc/gtut-files/03-args.xml
+  doc/gtut-files/04-callback.c
+  doc/gtut-files/04-callback.output
+  doc/gtut-files/05-globals.c
+  doc/gtut-files/05-globals.output
+  doc/gtut-files/06-logs.c
+  doc/gtut-files/06-logs.output
+  doc/gtut-files/06-logs.output.error
+  doc/gtut-files/06-logs.output.fmt
+  doc/gtut-files/06-logs.output.fmt-bt
+  doc/gtut-files/06-logs.output.verbose
+  doc/gtut-files/07-timers.c
+  doc/gtut-files/07-timers.output
+  doc/gtut-files/08-exceptions.c
+  doc/gtut-files/08-exceptions.output
+  doc/gtut-files/09-datatype-dump.c
+  doc/gtut-files/09-simpledata.c
+  doc/gtut-files/09-simpledata.output
+  doc/gtut-files/10-rpc.c
+  doc/gtut-files/10-rpc.output
+  doc/gtut-files/11-explicitwait.c
+  doc/gtut-files/11-explicitwait.output
+  doc/gtut-files/11-explicitwait.xml
+  doc/gtut-files/gtut-platform-3nodes.xml
+  doc/gtut-files/gtut-platform.xml
+  doc/gtut-files/Makefile
+  doc/gtut-files/README
+  doc/gtut-files/test.xml
+)
+
 set(USER_GUIDE_SOURCES
+  doc/user_guide/doxygen/footer.html
+  doc/user_guide/doxygen/header.html
   doc/user_guide/doxygen/UserGuideDoxyfile.in
   doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
   doc/user_guide/doxygen/bindings.doc
@@ -628,11 +684,62 @@ set(USER_GUIDE_SOURCES
   doc/user_guide/doxygen/pls.doc
   doc/user_guide/doxygen/tracing.doc
   doc/user_guide/doxygen/use.doc
+  doc/user_guide/doxygen/stylesheet.css
+  )
+  
+set(LISTE_GTUT
+    doc/gtut-files/gtut-tour-00-install.doc
+    doc/gtut-files/gtut-tour-01-bones.doc
+    doc/gtut-files/gtut-tour-02-simple.doc
+    doc/gtut-files/gtut-tour-03-args.doc
+    doc/gtut-files/gtut-tour-04-callback.doc
+    doc/gtut-files/gtut-tour-05-globals.doc
+    doc/gtut-files/gtut-tour-06-logs.doc
+    doc/gtut-files/gtut-tour-07-timers.doc
+    doc/gtut-files/gtut-tour-08-exceptions.doc
+    doc/gtut-files/gtut-tour-09-simpledata.doc
+    doc/gtut-files/gtut-tour-10-rpc.doc
+    doc/gtut-files/gtut-tour-11-explicitwait.doc
+    doc/gtut-files/gtut-tour-12-staticstruct.doc
+    doc/gtut-files/gtut-tour-13-pointers.doc
+    doc/gtut-files/gtut-tour-14-dynar.doc
+    doc/gtut-files/gtut-tour-15-manualdatadef.doc
+    doc/gtut-files/gtut-tour-16-exchangecb.doc
+    doc/gtut-files/gtut-tour.doc
+    doc/gtut-files/gtut-tour-recap-messages.doc
   )
 
+set(EXTRA_LISTE_GTUT
+    doc/gtut-files/01-bones.output
+    doc/gtut-files/02-simple.output
+    doc/gtut-files/03-args.output
+    doc/gtut-files/03-args.xml
+    doc/gtut-files/04-callback.output
+    doc/gtut-files/05-globals.output
+    doc/gtut-files/06-logs.output
+    doc/gtut-files/06-logs.output.error
+    doc/gtut-files/06-logs.output.fmt
+    doc/gtut-files/06-logs.output.fmt-bt
+    doc/gtut-files/06-logs.output.verbose
+    doc/gtut-files/07-timers.output
+    doc/gtut-files/08-exceptions.output
+    doc/gtut-files/09-simpledata.output
+    doc/gtut-files/10-rpc.output
+    doc/gtut-files/11-explicitwait.output
+    doc/gtut-files/11-explicitwait.xml
+    doc/gtut-files/gtut-howto-design.doc
+    doc/gtut-files/gtut-howto.doc
+    doc/gtut-files/gtut-introduction.doc
+    doc/gtut-files/gtut-main.doc
+    doc/gtut-files/gtut-platform-3nodes.xml
+    doc/gtut-files/gtut-platform.xml
+    doc/gtut-files/README
+    doc/gtut-files/test.xml
+    )
+  
 set(REF_GUIDE_SOURCES
-  doc/ref_guide/doxygen/RefGuideDoxyfile.in
-  doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
+  doc/ref_guide/doxygen/footer.html
+  doc/ref_guide/doxygen/header.html
   doc/ref_guide/doxygen/main.doc
   doc/ref_guide/doxygen/module-amok.doc
   doc/ref_guide/doxygen/module-gras.doc
@@ -643,18 +750,75 @@ set(REF_GUIDE_SOURCES
   doc/ref_guide/doxygen/module-trace.doc
   doc/ref_guide/doxygen/module-xbt.doc
   doc/ref_guide/doxygen/modules.doc
+  doc/ref_guide/doxygen/RefGuideDoxyfile.in
+  doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
+  doc/ref_guide/doxygen/stylesheet.css
   )
 
-set(SHARED_SOURCES
+set(DEV_GUIDE_SOURCES
+  doc/dev_guide/doxygen/footer.html
+  doc/dev_guide/doxygen/header.html
+  doc/dev_guide/doxygen/index.doc
+  doc/dev_guide/doxygen/cmake.doc
+  doc/dev_guide/doxygen/simgrid.doc
+  doc/dev_guide/doxygen/xps.doc
+  doc/dev_guide/doxygen/DevGuideDoxyfile.in
+  doc/dev_guide/doxygen/DevGuideDoxygenLayout.xml
+  doc/dev_guide/doxygen/stylesheet.css
   )
 
-set(DOC_FIGS
-  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
-  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
-  ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_sat.fig
-  ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_test.fig
-  ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/gras_comm.fig
-  )
+set(DOC_IMG
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.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/poster_thumbnail.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/README
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_001.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_002.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_003.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_004.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_005.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_006.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_007.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_008.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_009.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_010.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_011.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_012.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_013.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_014.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_015.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_016.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_017.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_018.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_019.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_020.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_021.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_022.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_023.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_024.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_025.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_026.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_027.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_028.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_029.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_030.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101.pdf
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
+${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
+)
 
 set(bin_files
   ${bin_files}
@@ -726,6 +890,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/simdag/properties/CMakeLists.txt
   examples/simdag/scheduling/CMakeLists.txt
   examples/smpi/CMakeLists.txt
+  examples/smpi/MM/CMakeLists.txt
   examples/xbt/CMakeLists.txt
   )
 
@@ -745,6 +910,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
+  teshsuite/smpi/CMakeLists.txt
   )
 
 set(TOOLS_CMAKEFILES_TXT
@@ -771,6 +937,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/GenerateDocWin.cmake
   buildtools/Cmake/GenerateRefGuide.cmake
   buildtools/Cmake/GenerateUserGuide.cmake
+  buildtools/Cmake/GenerateDevGuide.cmake
   buildtools/Cmake/MaintainerMode.cmake
   buildtools/Cmake/MakeExe.cmake
   buildtools/Cmake/MakeLib.cmake
@@ -786,6 +953,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Modules/FindRubySimgrid.cmake
   buildtools/Cmake/Modules/FindSimGrid.cmake
   buildtools/Cmake/Modules/FindValgrind.cmake
+  buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Option.cmake
   buildtools/Cmake/Pipol.cmake
   buildtools/Cmake/PrintArgs.cmake
@@ -802,7 +970,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Scripts/update_tesh.pl
   buildtools/Cmake/Supernovae.cmake
   buildtools/Cmake/UnitTesting.cmake
-  buildtools/Cmake/memcheck_tests.cmake
   buildtools/Cmake/src/gras_config.h.in
   buildtools/Cmake/src/simgrid.nsi.in
   buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c