couple cleanups

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 2f7ae90..6924941 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -49,10 +49,8 @@ set(EXTRA_DIST
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  src/surf/ns3/my-point-to-point-helper.h
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
-  src/surf/ns3/red-queue.h
   src/surf/plugins/energy.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
@@ -240,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
@@ -272,22 +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/my-point-to-point-helper.cc
-  src/surf/ns3/ns3_simulator.cc
-  src/surf/ns3/red-queue.cc
-  )
+set(NS3_SRC  src/surf/network_ns3.cpp
+             src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
   src/surf/AsImpl.cpp
@@ -335,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
@@ -356,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
@@ -393,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
   )
@@ -495,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})
@@ -550,8 +526,12 @@ set(MC_SRC
   src/mc/AddressSpace.cpp
   src/mc/Channel.cpp
   src/mc/Channel.hpp
+  src/mc/Checker.cpp
+  src/mc/Checker.hpp
   src/mc/Client.cpp
   src/mc/Client.hpp
+  src/mc/CommunicationDeterminismChecker.cpp
+  src/mc/CommunicationDeterminismChecker.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
@@ -560,6 +540,8 @@ set(MC_SRC
   src/mc/ObjectInformation.cpp
   src/mc/PageStore.hpp
   src/mc/PageStore.cpp
+  src/mc/SafetyChecker.cpp
+  src/mc/SafetyChecker.hpp
   src/mc/ChunkedData.hpp
   src/mc/ChunkedData.cpp
   src/mc/RegionSnapshot.cpp
@@ -570,6 +552,8 @@ set(MC_SRC
   src/mc/mc_forward.hpp
   src/mc/Process.hpp
   src/mc/Process.cpp
+  src/mc/Session.cpp
+  src/mc/Session.hpp
   src/mc/mc_unw.h
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
@@ -579,7 +563,6 @@ set(MC_SRC
   src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.h
   src/mc/mc_comm_pattern.cpp
-  src/mc/mc_comm_determinism.cpp
   src/mc/mc_compare.cpp
   src/mc/mc_diff.cpp
   src/mc/mc_dwarf.hpp
@@ -592,11 +575,11 @@ set(MC_SRC
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.h
   src/mc/mc_mmalloc.h
-  src/mc/mc_liveness.h
+  src/mc/LivenessChecker.hpp
   src/mc/LocationList.hpp
   src/mc/malloc.hpp
   src/mc/LocationList.cpp
-  src/mc/mc_liveness.cpp
+  src/mc/LivenessChecker.cpp
   src/mc/mc_record.cpp
   src/mc/mc_member.cpp
   src/mc/mc_memory.cpp
@@ -604,10 +587,10 @@ set(MC_SRC
   src/mc/mc_request.h
   src/mc/mc_request.cpp
   src/mc/mc_safety.h
-  src/mc/mc_safety.cpp
   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
@@ -616,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
@@ -662,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
@@ -717,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
@@ -921,69 +894,17 @@ 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_bypass/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/actions/CMakeLists.txt
-  examples/msg/bittorrent/CMakeLists.txt
-  examples/msg/chainsend/CMakeLists.txt
-  examples/msg/chord/CMakeLists.txt
-  examples/msg/cloud/CMakeLists.txt
-  examples/msg/energy/CMakeLists.txt
-  examples/msg/exception/CMakeLists.txt
-  examples/msg/gtnets/CMakeLists.txt 
-  examples/msg/icomms/CMakeLists.txt
-  examples/msg/io/CMakeLists.txt
-  examples/msg/kademlia/CMakeLists.txt
-  examples/msg/masterslave/CMakeLists.txt
-  examples/msg/mc/CMakeLists.txt
-  examples/msg/migration/CMakeLists.txt
-  examples/msg/ns3/CMakeLists.txt
-  examples/msg/parallel_task/CMakeLists.txt
-  examples/msg/pastry/CMakeLists.txt
-  examples/msg/pmm/CMakeLists.txt
-  examples/msg/priority/CMakeLists.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
-  examples/msg/tracing/CMakeLists.txt
-  
+    examples/msg/mc/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  
   examples/simdag/CMakeLists.txt
-  examples/simdag/dax/CMakeLists.txt
-  examples/simdag/dot/CMakeLists.txt
-  examples/simdag/goal/CMakeLists.txt
-  
   examples/smpi/CMakeLists.txt
-  examples/smpi/NAS/CMakeLists.txt
-  examples/smpi/smpi_msg_masterslave/CMakeLists.txt
-  examples/smpi/replay_multiple/CMakeLists.txt
-  examples/smpi/energy/f77/CMakeLists.txt
-  examples/smpi/energy/f90/CMakeLists.txt
+    examples/smpi/NAS/CMakeLists.txt
+    examples/smpi/smpi_msg_masterslave/CMakeLists.txt
+    examples/smpi/replay_multiple/CMakeLists.txt
+    examples/smpi/energy/f77/CMakeLists.txt
+    examples/smpi/energy/f90/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
@@ -1046,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
@@ -1063,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
@@ -1105,14 +1024,21 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
+  examples/platforms/trace/bourassa_state.trace
+  examples/platforms/trace/fafard_state.trace
   examples/platforms/trace/faulty_host.trace
+  examples/platforms/trace/ginette_state.trace
   examples/platforms/trace/jupiter_speed.trace
+  examples/platforms/trace/jupiter_state.trace
   examples/platforms/trace/link1_avail.trace
+  examples/platforms/trace/link3_state.trace
+  examples/platforms/trace/link4_state.trace
   examples/platforms/trace/linkBandwidth7.bw
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
+  examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
   examples/platforms/faulty_host.xml
   examples/platforms/fat_tree_cluster.xml
@@ -1120,6 +1046,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
+  examples/platforms/onelink.xml
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
@@ -1141,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