X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1776f894cccfa2a6d9f7059772089eb35f1a8ebb..30d60b272963b1b130ea80840af783ee9c146b97:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 01dfb03fbd..e7033d9fcb 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -13,9 +13,7 @@ set(EXTRA_DIST src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/surf.h - src/include/xbt/wine_dbghelp.h src/msg/msg_private.h - src/portable.h src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h @@ -60,20 +58,23 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp + + src/surf/AsImpl.hpp + src/surf/AsCluster.hpp + src/surf/AsClusterFatTree.hpp + src/surf/AsClusterTorus.hpp + src/surf/AsDijkstra.hpp + src/surf/AsFloyd.hpp + src/surf/AsFull.hpp + src/surf/AsRoutedGraph.hpp + src/surf/AsNone.hpp + src/surf/AsVivaldi.hpp + src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.h src/surf/surf_routing.hpp - src/surf/surf_routing_cluster.hpp - src/surf/surf_routing_cluster_fat_tree.hpp - src/surf/surf_routing_cluster_torus.hpp - src/surf/surf_routing_dijkstra.hpp - src/surf/surf_routing_floyd.hpp - src/surf/surf_routing_full.hpp - src/surf/surf_routing_RoutedGraph.hpp - src/surf/surf_routing_none.hpp - src/surf/surf_routing_vivaldi.hpp src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp src/surf/virtual_machine.hpp @@ -87,7 +88,6 @@ set(EXTRA_DIST src/xbt/automaton/parserPromela.yacc src/xbt/backtrace_dummy.c src/xbt/backtrace_linux.c - src/xbt/backtrace_windows.c src/xbt/dict_private.h src/xbt/ex_interface.h src/xbt/fifo_private.h @@ -291,6 +291,17 @@ set(NS3_SRC ) set(SURF_SRC + src/surf/AsImpl.cpp + src/surf/AsCluster.cpp + src/surf/AsClusterFatTree.cpp + src/surf/AsClusterTorus.cpp + src/surf/AsDijkstra.cpp + src/surf/AsFloyd.cpp + src/surf/AsFull.cpp + src/surf/AsRoutedGraph.cpp + src/surf/AsNone.cpp + src/surf/AsVivaldi.cpp + src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp @@ -312,15 +323,6 @@ set(SURF_SRC src/surf/surf_c_bindings.cpp 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 - src/surf/surf_routing_full.cpp - src/surf/surf_routing_RoutedGraph.cpp - src/surf/surf_routing_none.cpp - src/surf/surf_routing_vivaldi.cpp src/surf/xml/platf.hpp src/surf/xml/platf_private.hpp src/surf/xml/surfxml_sax_cb.cpp @@ -332,7 +334,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 @@ -423,13 +424,9 @@ set(SIMDAG_SRC src/simdag/sd_workstation.cpp ) if(HAVE_GRAPHVIZ) - set(SIMDAG_SRC - ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp - ) + set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp) else() - set(EXTRA_DIST - ${EXTRA_DIST} src/simdag/sd_dotloader.cpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.cpp) endif() set(BINDINGS_SRC @@ -575,7 +572,6 @@ set(MC_SRC src/mc/mc_unw.h src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp - src/mc/mc_object_info.h src/mc/mc_checkpoint.cpp src/mc/mc_snapshot.h src/mc/mc_snapshot.cpp @@ -603,7 +599,6 @@ set(MC_SRC src/mc/mc_record.cpp src/mc/mc_member.cpp src/mc/mc_memory.cpp - src/mc/mc_pair.cpp src/mc/mc_private.h src/mc/mc_request.h src/mc/mc_request.cpp @@ -647,7 +642,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/As.hpp include/simgrid/s4u/async.hpp include/simgrid/s4u/comm.hpp include/simgrid/s4u/engine.hpp @@ -685,6 +680,7 @@ set(headers_to_install include/xbt/log.h include/xbt/mallocator.h include/xbt/matrix.h + include/xbt/memory.hpp include/xbt/misc.h include/xbt/mmalloc.h include/xbt/module.h @@ -759,37 +755,22 @@ set(simgrid_sources ${XBT_SRC} ) -if(${HAVE_JEDULE}) - set(simgrid_sources - ${simgrid_sources} - ${JEDULE_SRC} - ) +if(${HAVE_JEDULE}) + set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC}) else() - set(EXTRA_DIST - ${EXTRA_DIST} - ${JEDULE_SRC} - ) + set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC}) endif() if(enable_smpi) - set(simgrid_sources - ${simgrid_sources} - ${SMPI_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${SMPI_SRC}) endif() if(HAVE_MC) - set(simgrid_sources - ${simgrid_sources} - ${MC_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${MC_SRC}) endif() if(HAVE_NS3) - set(simgrid_sources - ${simgrid_sources} - ${NS3_SRC} - ) + set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) endif() # WINDOWS @@ -802,16 +783,10 @@ if(WIN32) ) endif() -if(${HAVE_LUA}) - set(simgrid_sources - ${simgrid_sources} - ${LUA_SRC} - ) +if(HAVE_LUA) + set(simgrid_sources ${simgrid_sources} ${LUA_SRC}) else() - set(EXTRA_DIST - ${EXTRA_DIST} - ${LUA_SRC} - ) + set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC}) endif() set(DOC_SOURCES @@ -1042,10 +1017,7 @@ set(CMAKEFILES_TXT teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/allreduce/CMakeLists.txt - teshsuite/smpi/alltoall/CMakeLists.txt teshsuite/smpi/compute/CMakeLists.txt - teshsuite/smpi/reduce/CMakeLists.txt teshsuite/smpi/shared/CMakeLists.txt teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt @@ -1129,8 +1101,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