X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c02e1f29787b34a3fda957da0ecaeba632dbc29d..2ea9616febf4fe48b3f5ef8a4c49c0fd5fa4a8e2:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e5a6f89ac5..cde489f122 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -265,7 +265,7 @@ set(XBT_SRC
   src/xbt/lib.c
   src/xbt/log.c
   src/xbt/mallocator.c
-  src/xbt/parmap.c
+  src/xbt/parmap.cpp
   src/xbt/set.c
   src/xbt/setset.c
   src/xbt/snprintf.c
@@ -276,6 +276,7 @@ set(XBT_SRC
   src/xbt/xbt_main.c
   src/xbt/xbt_matrix.c
   src/xbt/xbt_os_time.c
+  src/xbt/xbt_os_file.c
   src/xbt/xbt_peer.c
   src/xbt/xbt_queue.c
   src/xbt/xbt_replay.c
@@ -352,7 +353,6 @@ set(SIMIX_SRC
   src/simix/libsmx.c
   src/simix/smx_context.c
   src/simix/smx_context_base.c
-  src/simix/smx_context_raw.c
   src/simix/smx_deployment.c
   src/simix/smx_environment.c
   src/simix/smx_global.c
@@ -367,6 +367,18 @@ 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/smx_context_raw.c)
+else()
+  set(SIMIX_SRC
+      ${SIMIX_SRC}
+      src/simix/smx_context_raw.c)
+endif()
+
+# Boost context may not be available
 if (HAVE_BOOST_CONTEXT)
   set(SIMIX_SRC
       ${SIMIX_SRC}
@@ -377,6 +389,17 @@ else()
       src/simix/smx_context_boost.cpp)
 endif()
 
+set(S4U_SRC
+  src/s4u/s4u_actor.cpp
+  src/s4u/s4u_async.cpp
+  src/s4u/s4u_comm.cpp
+  src/s4u/s4u_engine.cpp  
+  src/s4u/s4u_file.cpp  
+  src/s4u/s4u_host.cpp  
+  src/s4u/s4u_mailbox.cpp
+  src/s4u/s4u_storage.cpp
+)
+
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
   src/simgrid/host.cpp
@@ -541,6 +564,7 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
+  src/bindings/lua/factories/host.lua
   src/bindings/lua/lua_comm.c
   src/bindings/lua/lua_host.c
   src/bindings/lua/lua_platf.c
@@ -590,12 +614,15 @@ set(MC_SRC
   src/mc/AddressSpace.hpp
   src/mc/AddressSpace.cpp
   src/mc/Frame.hpp
+  src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
   src/mc/ModelChecker.cpp
   src/mc/ObjectInformation.hpp
   src/mc/ObjectInformation.cpp
   src/mc/PageStore.hpp
   src/mc/PageStore.cpp
+  src/mc/ChunkedData.hpp
+  src/mc/ChunkedData.cpp
   src/mc/RegionSnapshot.cpp
   src/mc/RegionSnapshot.hpp
   src/mc/Type.hpp
@@ -604,8 +631,8 @@ set(MC_SRC
 
   src/mc/mc_forward.h
   src/mc/mc_forward.hpp
-  src/mc/mc_process.h
-  src/mc/mc_process.cpp
+  src/mc/Process.hpp
+  src/mc/Process.cpp
   src/mc/mc_unw.h
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
@@ -620,9 +647,11 @@ set(MC_SRC
   src/mc/mc_comm_determinism.cpp
   src/mc/mc_compare.cpp
   src/mc/mc_diff.cpp
+  src/mc/mc_dwarf.hpp
   src/mc/mc_dwarf.cpp
   src/mc/mc_dwarf_attrnames.cpp
-  src/mc/mc_dwarf_expression.cpp
+  src/mc/DwarfExpression.hpp
+  src/mc/DwarfExpression.cpp
   src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
@@ -631,7 +660,8 @@ set(MC_SRC
   src/mc/mcer_ignore.h
   src/mc/mc_ignore.h
   src/mc/mc_liveness.h
-  src/mc/mc_location.h
+  src/mc/LocationList.hpp
+  src/mc/LocationList.cpp
   src/mc/mc_liveness.cpp
   src/mc/mc_record.cpp
   src/mc/mc_member.cpp
@@ -682,6 +712,15 @@ set(headers_to_install
   include/simgrid/simix.h
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/s4u/actor.hpp
+  include/simgrid/s4u/async.hpp
+  include/simgrid/s4u/comm.hpp
+  include/simgrid/s4u/engine.hpp  
+  include/simgrid/s4u/file.hpp  
+  include/simgrid/s4u/host.hpp  
+  include/simgrid/s4u/mailbox.hpp  
+  include/simgrid/s4u/storage.hpp  
+  include/simgrid/s4u.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
@@ -701,6 +740,7 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
+  include/xbt/file.h
   include/xbt/function_types.h
   include/xbt/graph.h
   include/xbt/graphxml.h
@@ -765,6 +805,7 @@ endif()
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}
+  ${S4U_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
@@ -866,6 +907,7 @@ set(DOC_SOURCES
   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
@@ -890,7 +932,7 @@ set(DOC_SOURCES
   doc/doxygen/pls.doc
   doc/doxygen/stylesheet.css
   doc/doxygen/tracing.doc
-  doc/doxygen/use.doc
+  doc/doxygen/examples.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
@@ -926,6 +968,7 @@ 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
   )
 
 # these files get copied automatically to the html documentation
@@ -939,6 +982,7 @@ 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
@@ -973,6 +1017,7 @@ set(txt_files
   COPYING
   README
   README.java
+  README.lua
   ChangeLog
   ChangeLog.SimGrid-java
   INSTALL
@@ -1015,6 +1060,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/onoff/CMakeLists.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 
@@ -1036,6 +1082,9 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
+  examples/s4u/CMakeLists.txt
+  examples/s4u/basic/CMakeLists.txt
+  examples/s4u/io/CMakeLists.txt
   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt
@@ -1062,6 +1111,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
   teshsuite/java/CMakeLists.txt
   teshsuite/java/sleep_host_off/CMakeLists.txt
+  teshsuite/lua/lua_platforms.tesh
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
@@ -1159,18 +1209,16 @@ set(TOOLS_CMAKEFILES_TXT
 
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
-  tools/cmake/AddTests.cmake
+  tools/cmake/Tests.cmake
   tools/cmake/CTestConfig.cmake
   tools/cmake/CTestCustom.cmake
-  tools/cmake/CompleteInFiles.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/Flags.cmake
-  tools/cmake/GenerateDoc.cmake
-  tools/cmake/GenerateDocWin.cmake
+  tools/cmake/GCCFlags.cmake
+  tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/MakeExe.cmake
-  tools/cmake/MakeJava.cmake
+  tools/cmake/Java.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/MakeLibWin.cmake
   tools/cmake/Modules/FindGFortran.cmake
@@ -1178,7 +1226,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLibSigc++.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
-  tools/cmake/Modules/FindLua51Simgrid.cmake
+  tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindRubySimgrid.cmake
@@ -1186,17 +1234,22 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
-  tools/cmake/Pipol.cmake
   tools/cmake/PrintArgs.cmake
-  tools/cmake/Scripts/Diff.pm
-  tools/cmake/Scripts/Makefile.default
-  tools/cmake/Scripts/SimGrid.packproj
-  tools/cmake/Scripts/generate_memcheck_tests.pl
-  tools/cmake/Scripts/java_bundle.sh
-  tools/cmake/Scripts/my_valgrind.pl
-  tools/cmake/Scripts/postinstall.sh
-  tools/cmake/Scripts/preinstall.sh
-  tools/cmake/Scripts/update_tesh.pl
+  tools/cmake/scripts/IPC/Run.pm
+  tools/cmake/scripts/IPC/Run/Debug.pm
+  tools/cmake/scripts/IPC/Run/IO.pm
+  tools/cmake/scripts/IPC/Run/Timer.pm
+  tools/cmake/scripts/IPC/Run/Win32Helper.pm
+  tools/cmake/scripts/IPC/Run/Win32IO.pm
+  tools/cmake/scripts/IPC/Run/Win32Pump.pm
+  tools/cmake/scripts/Diff.pm
+  tools/cmake/scripts/Makefile.default
+  tools/cmake/scripts/SimGrid.packproj
+  tools/cmake/scripts/generate_memcheck_tests.pl
+  tools/cmake/scripts/my_valgrind.pl
+  tools/cmake/scripts/postinstall.sh
+  tools/cmake/scripts/preinstall.sh
+  tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
   tools/cmake/src/internal_config.h.in
   tools/cmake/src/simgrid.nsi.in
@@ -1211,7 +1264,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/test_prog/prog_stacksetup.c
   tools/cmake/test_prog/prog_thread_storage.c
   tools/cmake/test_prog/prog_vsnprintf.c
-  buildtools/Cross/Mingw.cmake
+  tools/cmake/cross-mingw.cmake
   tools/stack-cleaner/as
   tools/stack-cleaner/cc
   tools/stack-cleaner/c++
@@ -1227,6 +1280,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cloud.xml
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
+  examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/crosstraffic.xml
@@ -1251,9 +1305,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
+  examples/platforms/platform.lua
   examples/platforms/platform.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
+  examples/platforms/routing_cluster.lua
   examples/platforms/routing_none.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
@@ -1262,6 +1318,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/storage/remote_io.xml
   examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml
+  examples/platforms/small_platform.lua
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml
   examples/platforms/small_platform_with_failures.xml