X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f2a0679abc416b526cae522772f7642026ccc32..3b84f2ca2a8d124c4d0c99c44a0f4ef7fac0d855:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 92d03a7914..6924941e92 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -238,7 +238,7 @@ set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c - src/xbt/config.c + src/xbt/config.cpp src/xbt/cunit.c src/xbt/dict.c src/xbt/dict_cursor.c @@ -270,20 +270,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 +325,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/RawContext.cpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp @@ -352,17 +345,6 @@ set(SIMIX_SRC ${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 @@ -389,7 +371,7 @@ set(S4U_SRC ) set(SIMGRID_SRC - src/simgrid/sg_config.c + src/simgrid/sg_config.cpp src/simgrid/host.cpp src/simgrid/util.hpp ) @@ -491,9 +473,7 @@ set(JTRACE_C_SRC src/bindings/java/jtrace.h ) -set(JTRACE_JAVA_SRC - src/bindings/java/org/simgrid/trace/Trace.java -) +set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java) list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) @@ -609,7 +589,8 @@ set(MC_SRC src/mc/mc_safety.h src/mc/mc_state.h src/mc/mc_state.cpp - src/mc/mc_visited.cpp + src/mc/VisitedState.cpp + src/mc/VisitedState.hpp src/mc/mc_client_api.cpp src/mc/mc_protocol.h src/mc/mc_protocol.cpp @@ -618,10 +599,10 @@ set(MC_SRC src/mc/mc_xbt.hpp src/mc/mc_xbt.cpp src/mc/mc_exit.h + 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 @@ -664,6 +645,7 @@ set(headers_to_install include/xbt/automaton.hpp include/xbt/base.h include/xbt/config.h + include/xbt/config.hpp include/xbt/cunit.h include/xbt/dict.h include/xbt/string.hpp @@ -719,27 +701,16 @@ else() # NOT pthread endif() if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC - ${SURF_SRC} - src/xbt/xbt_os_thread.c - ) + set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c) else() # NOT pthread - set(EXTRA_DIST - ${EXTRA_DIST} - src/xbt/xbt_os_thread.c + set(EXTRA_DIST ${EXTRA_DIST} src/xbt/xbt_os_thread.c ) endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC - ${SURF_SRC} - src/simix/UContext.cpp - ) + set(SURF_SRC ${SURF_SRC} src/simix/UContext.cpp) else() # NOT ucontext - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/UContext.cpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/UContext.cpp) endif() ### Simgrid Lib sources @@ -923,32 +894,8 @@ set(txt_files # The list of cmake build directories is constructed from the following list. # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT - examples/java/async/CMakeLists.txt - examples/java/bittorrent/CMakeLists.txt - examples/java/chord/CMakeLists.txt - examples/java/cloud/CMakeLists.txt - examples/java/cloud/energy/CMakeLists.txt - examples/java/cloud/migration/CMakeLists.txt - examples/java/commTime/CMakeLists.txt - examples/java/energy/CMakeLists.txt - examples/java/io/CMakeLists.txt - examples/java/kademlia/CMakeLists.txt - examples/java/master_slave_kill/CMakeLists.txt - examples/java/masterslave/CMakeLists.txt - examples/java/migration/CMakeLists.txt - examples/java/mutualExclusion/CMakeLists.txt - examples/java/pingPong/CMakeLists.txt - examples/java/priority/CMakeLists.txt - examples/java/startKillTime/CMakeLists.txt - examples/java/suspend/CMakeLists.txt - examples/java/tracing/CMakeLists.txt - + examples/java/CMakeLists.txt examples/msg/CMakeLists.txt - examples/msg/bittorrent/CMakeLists.txt - examples/msg/chainsend/CMakeLists.txt - examples/msg/cloud/CMakeLists.txt - examples/msg/dht-kademlia/CMakeLists.txt - examples/msg/masterslave/CMakeLists.txt examples/msg/mc/CMakeLists.txt examples/s4u/CMakeLists.txt examples/simdag/CMakeLists.txt @@ -1020,7 +967,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 @@ -1037,7 +983,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/IPC/Run/Win32IO.pm tools/cmake/scripts/IPC/Run/Win32Pump.pm tools/cmake/scripts/Diff.pm - tools/cmake/scripts/generate_memcheck_tests.pl tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake @@ -1123,6 +1068,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_harvard.syscoord examples/platforms/syscoord/median_meridian.syscoord examples/platforms/syscoord/median_p2psim.syscoord + examples/platforms/three_multicore_hosts.xml examples/platforms/torus_cluster.xml examples/platforms/two_hosts.xml examples/platforms/two_hosts_platform.xml