X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b8f849b45ded567cf10c7da022447a775270a0e..2f531aa69f09fed380e2e212df5822874aab5e58:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 32ab76fc0b..7e9bd31d89 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -83,7 +83,7 @@ set(EXTRA_DIST src/surf/surfxml_parse.c src/surf/trace_mgr_private.h src/surf/vm_hl13.hpp - src/surf/vm_interface.hpp + src/surf/virtual_machine.hpp src/surf/host_clm03.hpp src/surf/host_interface.hpp src/surf/host_ptask_L07.hpp @@ -105,6 +105,7 @@ set(EXTRA_DIST src/xbt/heap_private.h src/xbt/log_private.h src/xbt/mallocator_private.h + src/xbt/mmalloc/mfree.c src/xbt/mmalloc/mm.c src/xbt/mmalloc/mm_legacy.c @@ -117,7 +118,6 @@ set(EXTRA_DIST src/xbt/mmalloc/mmtrace.awk src/xbt/mmalloc/mrealloc.c src/xbt/probes.h - src/xbt/setset_private.h src/xbt/win32_ucontext.c tools/tesh/generate_tesh examples/smpi/mc/only_send_deterministic.tesh @@ -230,6 +230,7 @@ set(SMPI_SRC src/smpi/instr_smpi.c src/smpi/smpi_base.c src/smpi/smpi_bench.c + src/smpi/smpi_memory.cpp src/smpi/smpi_c99.c src/smpi/smpi_coll.c src/smpi/smpi_comm.c @@ -265,9 +266,10 @@ set(XBT_SRC src/xbt/lib.c src/xbt/log.c src/xbt/mallocator.c + src/xbt/memory_map.cpp + src/xbt/memory_map.hpp src/xbt/parmap.cpp src/xbt/set.c - src/xbt/setset.c src/xbt/snprintf.c src/xbt/swag.c src/xbt/xbt_log_appender_file.c @@ -286,6 +288,7 @@ set(XBT_SRC src/xbt/xbt_strbuff.c src/xbt/xbt_virtu.c src/xbt_modinter.h + ) if(HAVE_MMALLOC) @@ -339,7 +342,7 @@ set(SURF_SRC src/surf/surfxml_parseplatf.c src/surf/trace_mgr.c src/surf/vm_hl13.cpp - src/surf/vm_interface.cpp + src/surf/virtual_machine.cpp src/surf/host_clm03.cpp src/surf/host_interface.cpp src/surf/host_ptask_L07.cpp @@ -564,6 +567,7 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) set(LUA_SRC + src/bindings/lua/factories/host.lua src/bindings/lua/lua_comm.c src/bindings/lua/lua_host.c src/bindings/lua/lua_platf.c @@ -613,12 +617,15 @@ set(MC_SRC src/mc/AddressSpace.hpp src/mc/AddressSpace.cpp src/mc/Frame.hpp + src/mc/Frame.cpp src/mc/ModelChecker.hpp src/mc/ModelChecker.cpp src/mc/ObjectInformation.hpp src/mc/ObjectInformation.cpp src/mc/PageStore.hpp src/mc/PageStore.cpp + src/mc/ChunkedData.hpp + src/mc/ChunkedData.cpp src/mc/RegionSnapshot.cpp src/mc/RegionSnapshot.hpp src/mc/Type.hpp @@ -653,10 +660,10 @@ set(MC_SRC src/mc/mc_hash.cpp src/mc/mc_ignore.cpp src/mc/mcer_ignore.cpp - src/mc/mcer_ignore.h src/mc/mc_ignore.h src/mc/mc_liveness.h - src/mc/mc_location.h + src/mc/LocationList.hpp + src/mc/LocationList.cpp src/mc/mc_liveness.cpp src/mc/mc_record.cpp src/mc/mc_member.cpp @@ -670,15 +677,11 @@ set(MC_SRC src/mc/mc_state.h src/mc/mc_state.cpp src/mc/mc_visited.cpp - src/mc/mc_memory_map.h - src/mc/memory_map.cpp src/mc/mc_client.cpp src/mc/mc_client_api.cpp src/mc/mc_client.h src/mc/mc_protocol.h src/mc/mc_protocol.cpp - src/mc/mc_server.cpp - src/mc/mc_server.h src/mc/mc_smx.h src/mc/mc_smx.cpp src/mc/mc_xbt.hpp @@ -754,7 +757,6 @@ set(headers_to_install include/xbt/queue.h include/xbt/replay.h include/xbt/set.h - include/xbt/setset.h include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h @@ -977,6 +979,7 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/DiscoveringSimgrid.gif ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png @@ -1011,6 +1014,7 @@ set(txt_files COPYING README README.java + README.lua ChangeLog ChangeLog.SimGrid-java INSTALL @@ -1053,6 +1057,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/energy/consumption/CMakeLists.txt examples/msg/energy/onoff/CMakeLists.txt examples/msg/energy/pstate/CMakeLists.txt + examples/msg/energy/vm/CMakeLists.txt examples/msg/exception/CMakeLists.txt examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt @@ -1103,6 +1108,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/bug-17132/CMakeLists.txt teshsuite/java/CMakeLists.txt teshsuite/java/sleep_host_off/CMakeLists.txt + teshsuite/lua/lua_platforms.tesh teshsuite/mc/CMakeLists.txt teshsuite/mc/dwarf/CMakeLists.txt teshsuite/mc/dwarf_expression/CMakeLists.txt @@ -1203,7 +1209,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Tests.cmake tools/cmake/CTestConfig.cmake tools/cmake/CTestCustom.cmake - tools/cmake/CompleteInFiles.cmake tools/cmake/DefinePackages.cmake tools/cmake/Distrib.cmake tools/cmake/GCCFlags.cmake @@ -1218,7 +1223,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLibSigc++.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibunwind.cmake - tools/cmake/Modules/FindLua51Simgrid.cmake + tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindRngStream.cmake tools/cmake/Modules/FindRubySimgrid.cmake @@ -1272,6 +1277,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/cloud.xml examples/platforms/cluster.xml examples/platforms/cluster_and_one_host.xml + examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml examples/platforms/clusters_routing_full.xml examples/platforms/crosstraffic.xml @@ -1296,9 +1302,11 @@ set(PLATFORMS_EXAMPLES examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml + examples/platforms/platform.lua examples/platforms/platform.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml + examples/platforms/routing_cluster.lua examples/platforms/routing_none.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt @@ -1307,6 +1315,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/storage/remote_io.xml examples/platforms/storage/storage.xml examples/platforms/small_platform.xml + examples/platforms/small_platform.lua examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml examples/platforms/small_platform_with_failures.xml