X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6ccf4192ed4203b1a9f60d2d9b6ecc2921977cb..4c14aa1da000574efad40a5d0b6fee1f13cd5b6f:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 3efaeb6ae6..5f227ea4a3 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -18,7 +18,6 @@ set(EXTRA_DIST src/include/surf/trace_mgr.h src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h - src/include/xbt/xbt_os_time.h src/msg/msg_mailbox.h src/msg/msg_private.h src/portable.h @@ -234,7 +233,7 @@ set(SMPI_SRC src/smpi/smpi_topo.c ) -if(SMPI_F2C) +if(SMPI_FORTRAN) set(SMPI_SRC ${SMPI_SRC} src/smpi/smpi_f77.c @@ -333,8 +332,8 @@ set(SURF_SRC src/surf/surf_interface.cpp src/surf/surf_routing.cpp src/surf/surf_routing_cluster.cpp - src/surf/surf_routing_cluster_torus.cpp src/surf/surf_routing_cluster_fat_tree.cpp + src/surf/surf_routing_cluster_torus.cpp src/surf/surf_routing_dijkstra.cpp src/surf/surf_routing_floyd.cpp src/surf/surf_routing_full.cpp @@ -661,11 +660,11 @@ set(headers_to_install include/xbt/sysdep.h include/xbt/virtu.h include/xbt/xbt_os_thread.h + include/xbt/xbt_os_time.h ) set(source_of_generated_headers include/simgrid_config.h.in include/smpi/mpif.h.in - include/smpi/smpif.h.in src/context_sysv_config.h.in) ### depend of some variables setted upper @@ -794,6 +793,10 @@ set(DOC_SOURCES doc/sg_thread_model.fig doc/simix.fig doc/surf_nutshell.fig + doc/surf++.png + doc/surf++.pdf + doc/surf++.graphml + doc/surf++.uml doc/triva-graph_configuration.png doc/triva-graph_configuration.svg doc/triva-graph_visualization.png @@ -839,6 +842,9 @@ set(DOC_SOURCES doc/doxygen/use.doc doc/manpage/smpicc.1 + doc/manpage/smpicxx.1 + doc/manpage/smpif90.1 + doc/manpage/smpiff.1 doc/manpage/smpirun.1 doc/msg-tuto-src/deployment0.xml @@ -903,7 +909,6 @@ set(bin_files ${bin_files} src/smpi/smpicc.in src/smpi/smpicxx.in - src/smpi/smpif2c.in src/smpi/smpiff.in src/smpi/smpif90.in src/smpi/smpirun.in @@ -1099,7 +1104,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/MakeJava.cmake buildtools/Cmake/MakeLib.cmake buildtools/Cmake/MakeLibWin.cmake - buildtools/Cmake/Modules/FindF2c.cmake buildtools/Cmake/Modules/FindGFortran.cmake buildtools/Cmake/Modules/FindGTnets.cmake buildtools/Cmake/Modules/FindGraphviz.cmake @@ -1162,6 +1166,8 @@ set(PLATFORMS_EXAMPLES examples/platforms/content/storage_content.txt examples/platforms/content/win_storage_content.txt examples/platforms/data_center.xml + examples/platforms/deployment_remote_io.xml + examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml examples/platforms/generation_scripts/create_hierarchical_clusters.pl examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl @@ -1171,6 +1177,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/prop.xml + examples/platforms/remote_io.xml examples/platforms/routing_cluster.xml examples/platforms/storage.xml examples/platforms/syscoord/generate_peer_platform.pl