X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74225b4ab9dc011bc2ce1021c460ecdced98b4dc..6c42816d20ed7b59afb42d65653f35b3a3499c3a:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1f1e27d24a..b943ec479c 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,6 +2,7 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
+  src/bindings/python/simgrid_python.cpp
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
@@ -32,6 +33,8 @@ set(EXTRA_DIST
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp
   src/smpi/include/smpi_utils.hpp
+  src/smpi/smpi_main.c
+  src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
@@ -63,8 +66,6 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
-  src/xbt/backtrace_dummy.cpp
-  src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
   src/xbt/log_private.h
   src/xbt/mallocator_private.h
@@ -92,7 +93,6 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
-  src/smpi/smpi_main.c
   src/smpi/bindings/smpi_mpi.cpp
   src/smpi/bindings/smpi_pmpi.cpp
   src/smpi/bindings/smpi_pmpi_coll.cpp
@@ -282,6 +282,7 @@ set(XBT_SRC
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
+  src/xbt/OsSemaphore.hpp
   src/xbt/parmap.cpp
   src/xbt/snprintf.c
   src/xbt/string.cpp
@@ -291,6 +292,7 @@ set(XBT_SRC
   src/xbt/xbt_main.cpp
   src/xbt/xbt_os_file.cpp
   src/xbt/xbt_os_synchro.cpp
+  src/xbt/xbt_os_thread.c
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
@@ -381,6 +383,10 @@ set(SIMIX_SRC
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
   src/kernel/context/ContextRaw.hpp
+  src/kernel/context/ContextSwapped.cpp
+  src/kernel/context/ContextSwapped.hpp
+  src/kernel/context/ContextThread.cpp
+  src/kernel/context/ContextThread.hpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -455,7 +461,6 @@ set(MSG_SRC
   src/msg/msg_gos.cpp
   src/msg/msg_legacy.cpp
   src/msg/msg_process.cpp
-  src/msg/msg_synchro.cpp
   src/msg/msg_task.cpp
   )
 
@@ -692,6 +697,7 @@ set(headers_to_install
   include/simgrid/kernel/future.hpp
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/semaphore.h
   include/simgrid/storage.h
   include/simgrid/vm.h
   include/simgrid/zone.h
@@ -779,25 +785,11 @@ set(headers_to_install
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  src/internal_config.h.in
+  src/simgrid/version.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper
-# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-endif()
-
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  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
-    )
-endif()
-
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
   set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
@@ -839,16 +831,6 @@ if(SIMGRID_HAVE_NS3)
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
 endif()
 
-# WINDOWS
-if(WIN32)
-  set(simgrid_sources
-    ${simgrid_sources}
-    src/kernel/context/ContextThread.cpp
-    src/kernel/context/ContextThread.hpp
-    src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(SIMGRID_HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
@@ -905,6 +887,8 @@ set(DOC_SOURCES
   docs/source/img/extlink.png
   docs/source/img/extlink.svg
   docs/source/img/graphical-toc.svg
+  docs/source/img/lang_cpp.png
+  docs/source/img/lang_python.png
   docs/source/img/smpi_simgrid_alltoall_pair_16.png
   docs/source/img/smpi_simgrid_alltoall_ring_16.png
   docs/source/img/zone_hierarchy.png
@@ -1008,6 +992,7 @@ set(CMAKEFILES_TXT
   examples/java/CMakeLists.txt
   examples/msg/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
+  examples/python/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt
@@ -1015,7 +1000,6 @@ set(CMAKEFILES_TXT
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
     examples/smpi/replay_multiple/CMakeLists.txt
     examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
-    examples/smpi/load_balancer_replay/CMakeLists.txt
     examples/smpi/energy/f77/CMakeLists.txt
     examples/smpi/energy/f90/CMakeLists.txt
 
@@ -1074,7 +1058,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/CTestCustom.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/GCCFlags.cmake
+  tools/cmake/Flags.cmake
   tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/Java.cmake
@@ -1095,18 +1079,10 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
-  tools/cmake/src/internal_config.h.in
   tools/cmake/test_prog/prog_asan.cpp
-  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
-  tools/cmake/test_prog/prog_sem_timedwait.c
-  tools/cmake/test_prog/prog_snprintf.c
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
-  tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
   tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as