X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/36be502e3e8faf5cd2867b3a8f71b1532970666d..a01a7e62056a8ca98b42a0c5c91d0eb84c28c2ef:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index c9aa053e14..45a3c2d906 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -29,9 +29,14 @@ set(EXTRA_DIST src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h - src/simix/smx_private.hpp src/simix/smx_process_private.h src/simix/smx_synchro_private.h + src/simix/Synchro.h + src/simix/SynchroComm.hpp + src/simix/SynchroExec.hpp + src/simix/SynchroIo.hpp + src/simix/SynchroSleep.hpp + src/simix/SynchroRaw.hpp src/smpi/README src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h @@ -270,20 +275,14 @@ set(XBT_SRC src/xbt/xbt_strbuff.c src/xbt/xbt_virtu.c src/xbt_modinter.h - ) if(HAVE_MMALLOC) - set(XBT_SRC - ${XBT_SRC} - src/xbt/mmalloc/mm.c - ) + set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c ) endif() -set(NS3_SRC - src/surf/network_ns3.cpp - src/surf/ns3/ns3_simulator.cc - ) +set(NS3_SRC src/surf/network_ns3.cpp + src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC src/surf/AsImpl.cpp @@ -331,13 +330,12 @@ set(SURF_SRC src/surf/ptask_L07.cpp ) -set(SIMIX_GENERATED_SRC - src/simix/popping_generated.cpp - ) +set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC src/simix/libsmx.cpp src/simix/smx_context.cpp src/simix/Context.cpp + src/simix/ContextRaw.cpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp @@ -348,38 +346,33 @@ set(SIMIX_SRC src/simix/smx_synchro.cpp src/simix/smx_vm.cpp src/simix/popping.cpp - + src/simix/Synchro.cpp + src/simix/SynchroComm.cpp + src/simix/SynchroExec.cpp + src/simix/SynchroSleep.cpp + src/simix/SynchroRaw.cpp + src/simix/SynchroIo.cpp + ${SIMIX_GENERATED_SRC} ) -# Don't try to compile our inline assembly with MSVC -if (MSVC) - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/RawContext.cpp) -else() - set(SIMIX_SRC - ${SIMIX_SRC} - src/simix/RawContext.cpp) -endif() - # Boost context may not be available if (HAVE_BOOST_CONTEXTS) set(SIMIX_SRC ${SIMIX_SRC} - src/simix/BoostContext.hpp - src/simix/BoostContext.cpp) + src/simix/ContextBoost.hpp + src/simix/ContextBoost.cpp) else() set(EXTRA_DIST ${EXTRA_DIST} - src/simix/BoostContext.hpp - src/simix/BoostContext.cpp) + src/simix/ContextBoost.hpp + src/simix/ContextBoost.cpp) endif() set(S4U_SRC src/s4u/s4u_actor.cpp src/s4u/s4u_as.cpp - src/s4u/s4u_async.cpp + src/s4u/s4u_activity.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp src/s4u/s4u_file.cpp @@ -581,8 +574,7 @@ set(MC_SRC src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.h src/mc/mc_comm_pattern.cpp - src/mc/mc_compare.cpp - src/mc/mc_diff.cpp + src/mc/compare.cpp src/mc/mc_dwarf.hpp src/mc/mc_dwarf.cpp src/mc/mc_dwarf_attrnames.cpp @@ -595,7 +587,6 @@ set(MC_SRC src/mc/mc_mmalloc.h src/mc/LivenessChecker.hpp src/mc/LocationList.hpp - src/mc/malloc.hpp src/mc/LocationList.cpp src/mc/LivenessChecker.cpp src/mc/mc_record.cpp @@ -620,8 +611,7 @@ set(MC_SRC src/mc/Transition.hpp ) -set(MC_SIMGRID_MC_SRC - src/mc/simgrid_mc.cpp) +set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp) set(headers_to_install include/msg/msg.h @@ -644,7 +634,7 @@ set(headers_to_install include/simgrid/s4u/forward.hpp include/simgrid/s4u/actor.hpp include/simgrid/s4u/As.hpp - include/simgrid/s4u/async.hpp + include/simgrid/s4u/Activity.hpp include/simgrid/s4u/comm.hpp include/simgrid/s4u/engine.hpp include/simgrid/s4u/file.hpp @@ -706,17 +696,11 @@ set(source_of_generated_headers ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC - ${SURF_SRC} - src/simix/ThreadContext.cpp - src/simix/ThreadContext.hpp - ) + set(SURF_SRC ${SURF_SRC} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) else() # NOT pthread - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/ThreadContext.cpp - src/simix/ThreadContext.hpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) endif() if(${HAVE_THREAD_CONTEXTS}) #pthread @@ -727,9 +711,9 @@ else() # NOT pthread endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/simix/UContext.cpp) + set(SURF_SRC ${SURF_SRC} src/simix/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST ${EXTRA_DIST} src/simix/UContext.cpp) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextUnix.cpp) endif() ### Simgrid Lib sources @@ -768,8 +752,8 @@ endif() if(WIN32) set(simgrid_sources ${simgrid_sources} - src/simix/ThreadContext.cpp - src/simix/ThreadContext.hpp + src/simix/ContextThread.cpp + src/simix/ContextThread.hpp src/xbt/xbt_os_thread.c ) endif() @@ -799,12 +783,12 @@ set(DOC_SOURCES doc/doxygen/FAQ.doc doc/doxygen/advanced.doc + doc/doxygen/application.doc doc/doxygen/bindings.doc doc/doxygen/contributing.doc doc/doxygen/deployment.doc doc/doxygen/footer.html doc/doxygen/getting_started.doc - doc/doxygen/getting_started_index.doc doc/doxygen/header.html doc/doxygen/help.doc doc/doxygen/index.doc @@ -858,7 +842,6 @@ set(DOC_FIGS set(DOC_TOOLS tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/index_create.pl tools/doxygen/xbt_log_extract_hierarchy.pl tools/doxygen/list_routing_models_examples.sh ) @@ -873,7 +856,6 @@ 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 @@ -986,7 +968,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/MakeLibWin.cmake tools/cmake/Modules/FindGFortran.cmake tools/cmake/Modules/FindGraphviz.cmake - tools/cmake/Modules/FindLibSigc++.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibunwind.cmake tools/cmake/Modules/FindLuaSimgrid.cmake