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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a3cb141f89..0a8819c175 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -272,6 +272,7 @@ set(XBT_SRC
   src/xbt/parmap.cpp
   src/xbt/set.c
   src/xbt/snprintf.c
+  src/xbt/string.cpp
   src/xbt/swag.c
   src/xbt/xbt_log_appender_file.c
   src/xbt/xbt_log_layout_format.c
@@ -374,14 +375,14 @@ set(SIMIX_SRC
   )
 
 # Don't try to compile our inline assembly with MSVC
-if (1)
+if (MSVC)
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_raw.cpp)
+      src/simix/RawContext.cpp)
 else()
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_raw.cpp)
+      src/simix/RawContext.cpp)
 endif()
 
 # Boost context may not be available
@@ -415,21 +416,21 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.c
-  src/msg/instr_msg_task.c
-  src/msg/instr_msg_vm.c
-  src/msg/msg_actions.c
-  src/msg/msg_deployment.c
-  src/msg/msg_environment.c
-  src/msg/msg_global.c
-  src/msg/msg_gos.c
-  src/msg/msg_host.c
-  src/msg/msg_io.c
-  src/msg/msg_mailbox.c
-  src/msg/msg_process.c
-  src/msg/msg_synchro.c
-  src/msg/msg_task.c
-  src/msg/msg_vm.c
+  src/msg/instr_msg_process.cpp
+  src/msg/instr_msg_task.cpp
+  src/msg/instr_msg_vm.cpp
+  src/msg/msg_actions.cpp
+  src/msg/msg_deployment.cpp
+  src/msg/msg_environment.cpp
+  src/msg/msg_global.cpp
+  src/msg/msg_gos.cpp
+  src/msg/msg_host.cpp
+  src/msg/msg_io.cpp
+  src/msg/msg_mailbox.cpp
+  src/msg/msg_process.cpp
+  src/msg/msg_synchro.cpp
+  src/msg/msg_task.cpp
+  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC
@@ -495,33 +496,31 @@ set(JSURF_JAVA_GENERATED_SRC
 )
 
 set(JMSG_C_SRC
-  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.cpp
   src/bindings/java/jmsg.h
-  src/bindings/java/jmsg_as.c
+  src/bindings/java/jmsg_as.cpp
   src/bindings/java/jmsg_as.h
-  src/bindings/java/jmsg_comm.c
+  src/bindings/java/jmsg_comm.cpp
   src/bindings/java/jmsg_comm.h
-  src/bindings/java/jmsg_file.c
+  src/bindings/java/jmsg_file.cpp
   src/bindings/java/jmsg_file.h
-  src/bindings/java/jmsg_host.c
+  src/bindings/java/jmsg_host.cpp
   src/bindings/java/jmsg_host.h
-  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.cpp
   src/bindings/java/jmsg_process.h
-  src/bindings/java/jmsg_rngstream.c
+  src/bindings/java/jmsg_rngstream.cpp
   src/bindings/java/jmsg_rngstream.h
-  src/bindings/java/jmsg_synchro.c
+  src/bindings/java/jmsg_synchro.cpp
   src/bindings/java/jmsg_synchro.h
-  src/bindings/java/jmsg_task.c
+  src/bindings/java/jmsg_task.cpp
   src/bindings/java/jmsg_task.h
-  src/bindings/java/jmsg_vm.c
+  src/bindings/java/jmsg_vm.cpp
   src/bindings/java/jmsg_vm.h
-  src/bindings/java/jxbt_utilities.c
+  src/bindings/java/jxbt_utilities.cpp
   src/bindings/java/jxbt_utilities.h
-  src/bindings/java/smx_context_cojava.c
-  src/bindings/java/smx_context_cojava.h
-  src/bindings/java/smx_context_java.c
-  src/bindings/java/smx_context_java.h
-  src/bindings/java/jmsg_storage.c
+  src/bindings/java/JavaContext.cpp
+  src/bindings/java/JavaContext.hpp
+  src/bindings/java/jmsg_storage.cpp
   src/bindings/java/jmsg_storage.h
 )
 
@@ -560,7 +559,7 @@ set(JMSG_JAVA_SRC
 )
 
 set(JTRACE_C_SRC
-  src/bindings/java/jtrace.c
+  src/bindings/java/jtrace.cpp
   src/bindings/java/jtrace.h
 )
 
@@ -708,6 +707,7 @@ set(headers_to_install
   include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
+  include/simgrid/forward.h
   include/simgrid/platf.h
   include/simgrid/platf_generator.h
   include/simgrid/plugins.h
@@ -724,6 +724,7 @@ set(headers_to_install
   include/simgrid/s4u/mailbox.hpp  
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.h
+  include/simgrid/Host.hpp
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
@@ -740,6 +741,7 @@ set(headers_to_install
   include/xbt/config.h
   include/xbt/cunit.h
   include/xbt/dict.h
+  include/xbt/string.hpp
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
@@ -751,6 +753,7 @@ set(headers_to_install
   include/xbt/hash.h
   include/xbt/heap.h
   include/xbt/lib.h
+  include/xbt/Facetable.hpp
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h
@@ -778,15 +781,17 @@ set(source_of_generated_headers
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
-if(0) #pthread
+if(${CONTEXT_THREADS}) #pthread
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_thread.cpp
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     )
 else() # NOT pthread
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_thread.cpp
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     )
 endif()
 
@@ -805,12 +810,12 @@ endif()
 if(${CONTEXT_UCONTEXT}) #ucontext
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_sysv.cpp
+    src/simix/UContext.cpp
     )
 else() # NOT ucontext
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_sysv.cpp
+    src/simix/UContext.cpp
     )
 endif()
 
@@ -873,7 +878,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/smx_context_thread.cpp
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )
@@ -1025,6 +1031,7 @@ set(bin_files
 
 set(txt_files
   ${txt_files}
+  .appveyor-download.cmd
   AUTHORS
   COPYING
   README