X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b141e7dadf8af49b3e6938268cec0443ea61a0b4..8199067e1f2a6ea4d3d8a38df1a4fb3f25d364da:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index c8d6fe5d1b..ca2166553d 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
@@ -60,6 +59,7 @@ set(EXTRA_DIST
   src/surf/network_interface.hpp
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
+  src/surf/network_ib.hpp
   src/surf/ns3/my-point-to-point-helper.h
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
@@ -232,10 +232,9 @@ set(SMPI_SRC
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
   src/smpi/smpi_topo.c
-  src/surf/surf_routing_cluster_fat_tree.cpp
   )
 
-if(SMPI_F2C)
+if(SMPI_FORTRAN)
   set(SMPI_SRC
     ${SMPI_SRC}
     src/smpi/smpi_f77.c
@@ -324,6 +323,7 @@ set(SURF_SRC
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
   src/surf/network_smpi.cpp
+  src/surf/network_ib.cpp
   src/surf/platf_generator.c
   src/surf/plugins/energy.cpp
   src/surf/random_mgr.c
@@ -334,6 +334,7 @@ set(SURF_SRC
   src/surf/surf_interface.cpp
   src/surf/surf_routing.cpp
   src/surf/surf_routing_cluster.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
@@ -497,6 +498,8 @@ set(JMSG_C_SRC
   src/bindings/java/smx_context_cojava.h
   src/bindings/java/smx_context_java.c
   src/bindings/java/smx_context_java.h
+  src/bindings/java/jmsg_storage.c
+  src/bindings/java/jmsg_storage.h
 )
 
 set(JSURF_C_SRC
@@ -523,6 +526,8 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
   src/bindings/java/org/simgrid/msg/RngStream.java
   src/bindings/java/org/simgrid/msg/Semaphore.java
+  src/bindings/java/org/simgrid/msg/Storage.java
+  src/bindings/java/org/simgrid/msg/StorageNotFoundException.java
   src/bindings/java/org/simgrid/msg/Task.java
   src/bindings/java/org/simgrid/msg/TaskCancelledException.java
   src/bindings/java/org/simgrid/msg/TimeoutException.java
@@ -661,11 +666,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 +799,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 +848,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
@@ -902,7 +914,7 @@ set(DOC_IMG
 set(bin_files
   ${bin_files}
   src/smpi/smpicc.in
-  src/smpi/smpif2c.in
+  src/smpi/smpicxx.in
   src/smpi/smpiff.in
   src/smpi/smpif90.in
   src/smpi/smpirun.in
@@ -1098,7 +1110,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
@@ -1161,6 +1172,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
@@ -1170,6 +1183,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