X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f23353a43b551cca580fbf043df1c38f5fb18d4..8f34741f2ecbd5b008788605bdec0333ef365007:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 27263131f1..03265d66de 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -17,7 +17,6 @@ set(EXTRA_DIST src/include/xbt/wine_dbghelp.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 @@ -108,7 +107,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 @@ -272,7 +270,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 @@ -387,6 +384,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 @@ -553,7 +551,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 @@ -651,6 +649,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 @@ -676,12 +675,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 @@ -986,7 +985,6 @@ set(CMAKEFILES_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 examples/msg/icomms/CMakeLists.txt examples/msg/io/CMakeLists.txt @@ -1022,7 +1020,6 @@ 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 @@ -1037,6 +1034,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 @@ -1054,23 +1052,17 @@ 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 @@ -1143,7 +1135,6 @@ 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 @@ -1250,23 +1241,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})