X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3eb95bea2b4188d46fa0cb4d652dd1d200f1e12..ccedb07575381e28a3143247e9028fe4f73bcd96:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index da66cbda31..4f6b7a0146 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 @@ -273,7 +280,7 @@ set(MSG_SRC ) #* ****************************************************************************************** *# -#* TUTORIAL: New API *# +#* TUTORIAL: New API *# set(MSG_SRC ${MSG_SRC} @@ -289,6 +296,19 @@ set(SIMIX_SRC ) #* ****************************************************************************************** *# +#* ****************************************************************************************** *# +#* TUTORIAL: New Model *# + +set(SURF_SRC + ${SURF_SRC} + src/surf/new_model.c + ) +set(EXTRA_DIST + ${EXTRA_DIST} + src/surf/new_model_private.h + ) +#* ****************************************************************************************** *# + set(PLATFGEN_SRC include/simgrid/platf_generator.h src/surf/platf_generator.c @@ -713,6 +733,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 ) @@ -732,6 +753,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 @@ -773,6 +795,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 @@ -789,7 +812,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