X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fea2606dff029fec63088d8e3d9f42925a67efea..f1e534022dbbd6004ab44cbc0f8c03f1d946deba:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 726c2476e7..fea800ad9d 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -13,12 +13,9 @@ set(EXTRA_DIST src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/surf.h - src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h - src/msg/msg_mailbox.h src/msg/msg_private.h src/portable.h - src/probes.tp src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h @@ -109,8 +106,6 @@ set(EXTRA_DIST src/xbt/mmalloc/mmorecore.c src/xbt/mmalloc/mmprivate.h src/xbt/mmalloc/mrealloc.c - src/xbt/probes.h - src/xbt/win32_ucontext.c tools/tesh/generate_tesh tools/lualib.patch teshsuite/lua/lua_platforms.tesh @@ -250,7 +245,6 @@ set(XBT_SRC src/xbt/dict.c src/xbt/dict_cursor.c src/xbt/dict_elm.c - src/xbt/dict_multi.c src/xbt/dynar.c src/xbt/ex.c src/xbt/fifo.c @@ -274,7 +268,6 @@ set(XBT_SRC src/xbt/xbt_os_synchro.c src/xbt/xbt_os_time.c src/xbt/xbt_replay.c - src/xbt/xbt_sha.c src/xbt/xbt_str.c src/xbt/xbt_strbuff.c src/xbt/xbt_virtu.c @@ -339,7 +332,6 @@ set(SURF_SRC src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp - src/xbt/xbt_sg_stubs.c ) set(SIMIX_GENERATED_SRC @@ -389,6 +381,7 @@ endif() set(S4U_SRC src/s4u/s4u_actor.cpp + src/s4u/s4u_as.cpp src/s4u/s4u_async.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp @@ -439,7 +432,6 @@ else() endif() set(BINDINGS_SRC - src/bindings/bindings_global.c src/bindings/lua/lua_private.h src/bindings/lua/lua_utils.h src/bindings/lua/simgrid_lua.h @@ -556,7 +548,7 @@ set(MC_SRC_BASE ) set(MC_SRC - src/mc/remote_ptr.hpp + src/mc/RemotePtr.hpp src/mc/AddressSpace.hpp src/mc/AddressSpace.cpp src/mc/Frame.hpp @@ -582,7 +574,6 @@ set(MC_SRC src/mc/mc_unw.h src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp - src/mc/mc_mmalloc.h src/mc/mc_object_info.h src/mc/mc_checkpoint.cpp src/mc/mc_snapshot.h @@ -603,6 +594,7 @@ set(MC_SRC src/mc/mc_hash.cpp src/mc/mc_ignore.cpp src/mc/mc_ignore.h + src/mc/mc_mmalloc.h src/mc/mc_liveness.h src/mc/LocationList.hpp src/mc/LocationList.cpp @@ -654,6 +646,7 @@ set(headers_to_install include/simgrid/link.h include/simgrid/s4u/forward.hpp include/simgrid/s4u/actor.hpp + include/simgrid/s4u/as.hpp include/simgrid/s4u/async.hpp include/simgrid/s4u/comm.hpp include/simgrid/s4u/engine.hpp @@ -679,12 +672,12 @@ set(headers_to_install include/xbt/string.hpp include/xbt/signal.hpp include/xbt/dynar.h + include/xbt/dynar.hpp include/xbt/ex.h include/xbt/fifo.h include/xbt/file.h include/xbt/function_types.h include/xbt/graph.h - include/xbt/hash.h include/xbt/heap.h include/xbt/lib.h include/xbt/Extendable.hpp @@ -709,8 +702,7 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid_config.h.in - include/smpi/mpif.h.in - src/context_sysv_config.h.in) + include/smpi/mpif.h.in) ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS @@ -805,7 +797,6 @@ if(WIN32) ${simgrid_sources} src/simix/ThreadContext.cpp src/simix/ThreadContext.hpp - src/xbt/win32_ucontext.c src/xbt/xbt_os_thread.c ) endif() @@ -947,7 +938,6 @@ set(txt_files README.java README.lua ChangeLog - ChangeLog.SimGrid-java INSTALL LICENSE-LGPL-2.1 NEWS @@ -984,12 +974,8 @@ set(CMAKEFILES_TXT examples/msg/chainsend/CMakeLists.txt examples/msg/chord/CMakeLists.txt examples/msg/cloud/CMakeLists.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/energy/CMakeLists.txt examples/msg/exception/CMakeLists.txt - examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt examples/msg/io/CMakeLists.txt @@ -1005,6 +991,7 @@ set(CMAKEFILES_TXT examples/msg/properties/CMakeLists.txt examples/msg/semaphores/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt + examples/msg/set-maestro/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt @@ -1025,14 +1012,12 @@ set(CMAKEFILES_TXT examples/smpi/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt - examples/smpi/MM/CMakeLists.txt examples/smpi/energy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt teshsuite/bug-17132/CMakeLists.txt - teshsuite/java/semaphore/CMakeLists.txt - teshsuite/java/sleep_host_off/CMakeLists.txt + teshsuite/java/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/mc/dwarf/CMakeLists.txt teshsuite/mc/dwarf_expression/CMakeLists.txt @@ -1040,6 +1025,7 @@ set(CMAKEFILES_TXT teshsuite/msg/get_sender/CMakeLists.txt teshsuite/msg/host_on_off/CMakeLists.txt teshsuite/msg/host_on_off_processes/CMakeLists.txt + teshsuite/msg/listen_async/CMakeLists.txt teshsuite/msg/pid/CMakeLists.txt teshsuite/msg/process/CMakeLists.txt teshsuite/msg/process_join/CMakeLists.txt @@ -1057,23 +1043,11 @@ set(CMAKEFILES_TXT teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/allgather/CMakeLists.txt - teshsuite/smpi/allgatherv/CMakeLists.txt teshsuite/smpi/allreduce/CMakeLists.txt teshsuite/smpi/alltoall/CMakeLists.txt - teshsuite/smpi/alltoallv/CMakeLists.txt - teshsuite/smpi/barrier/CMakeLists.txt - teshsuite/smpi/bcast/CMakeLists.txt teshsuite/smpi/compute/CMakeLists.txt - teshsuite/smpi/gather/CMakeLists.txt - teshsuite/smpi/hvector/CMakeLists.txt - teshsuite/smpi/indexed/CMakeLists.txt - teshsuite/smpi/pingpong/CMakeLists.txt teshsuite/smpi/reduce/CMakeLists.txt - teshsuite/smpi/scatter/CMakeLists.txt teshsuite/smpi/shared/CMakeLists.txt - teshsuite/smpi/struct/CMakeLists.txt - teshsuite/smpi/vector/CMakeLists.txt teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -1111,14 +1085,8 @@ set(CMAKEFILES_TXT teshsuite/surf/surf_usage/CMakeLists.txt teshsuite/surf/trace_usage/CMakeLists.txt - teshsuite/xbt/heap_bench/CMakeLists.txt - teshsuite/xbt/log_large/CMakeLists.txt - teshsuite/xbt/log_usage/CMakeLists.txt - teshsuite/xbt/mallocator/CMakeLists.txt + teshsuite/xbt/CMakeLists.txt teshsuite/xbt/mmalloc/CMakeLists.txt - teshsuite/xbt/parallel_log/CMakeLists.txt - teshsuite/xbt/parmap_bench/CMakeLists.txt - teshsuite/xbt/parmap_test/CMakeLists.txt tools/CMakeLists.txt tools/graphicator/CMakeLists.txt @@ -1146,11 +1114,9 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindRngStream.cmake - tools/cmake/Modules/FindRubySimgrid.cmake tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/PrintArgs.cmake tools/cmake/scripts/IPC/Run.pm tools/cmake/scripts/IPC/Run/Debug.pm tools/cmake/scripts/IPC/Run/IO.pm @@ -1164,8 +1130,8 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in - tools/cmake/test_prog/prog_AC_CHECK_MCSC.c tools/cmake/test_prog/prog_gnu_dynlinker.c + tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_mutex_timedlock.c tools/cmake/test_prog/prog_sem_init.c tools/cmake/test_prog/prog_sem_open.c @@ -1253,23 +1219,6 @@ set(generated_src_files src/xbt/automaton/parserPromela.tab.hacc ) -if(enable_ust) - set(simgrid_sources ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${simgrid_sources}) - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h - COMMAND lttng-gen-tp -o simgrid_ust.c -o simgrid_ust.h ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/probes.tp - ) - ADD_CUSTOM_TARGET(simgrid_ust - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c - ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.h - ) - set(generated_src_files ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_ust.c ${generated_src_files}) -endif() - foreach(file ${generated_src_files}) set_source_files_properties(${file} PROPERTIES GENERATED true) endforeach(file ${generated_src_files})