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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e821e20f80..525280cb55 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -7,8 +7,10 @@ set(EXTRA_DIST
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
   src/include/surf/surf.hpp
+  src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
   src/include/xbt/mmalloc.h
+  src/include/catch.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/msg/msg_private.hpp
@@ -67,7 +69,7 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
   src/xbt/dict_private.h
-  src/xbt/log_private.h
+  src/xbt/log_private.hpp
   src/xbt/mallocator_private.h
 
   src/xbt/mmalloc/mfree.c
@@ -88,8 +90,8 @@ set(EXTRA_DIST
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
 
-  examples/java/.classpath
-  examples/java/.project
+  examples/deprecated/java/.classpath
+  examples/deprecated/java/.project
   )
 
 set(SMPI_SRC
@@ -278,7 +280,7 @@ set(XBT_SRC
   src/xbt/dynar.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c
-  src/xbt/log.c
+  src/xbt/log.cpp
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
@@ -286,13 +288,12 @@ set(XBT_SRC
   src/xbt/parmap.cpp
   src/xbt/snprintf.c
   src/xbt/string.cpp
-  src/xbt/xbt_log_appender_file.c
-  src/xbt/xbt_log_layout_format.c
-  src/xbt/xbt_log_layout_simple.c
+  src/xbt/xbt_log_appender_file.cpp
+  src/xbt/xbt_log_layout_format.cpp
+  src/xbt/xbt_log_layout_simple.cpp
   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
@@ -780,7 +781,6 @@ set(headers_to_install
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
   include/xbt/virtu.h
-  include/xbt/xbt_os_thread.h
   include/xbt/xbt_os_time.h
   )
 set(source_of_generated_headers
@@ -791,7 +791,7 @@ set(source_of_generated_headers
 
 ### depend of some variables setted upper
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
+  set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
   set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
@@ -989,12 +989,7 @@ 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/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
     examples/smpi/NAS/CMakeLists.txt
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
@@ -1002,6 +997,11 @@ set(CMAKEFILES_TXT
     examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
     examples/smpi/energy/f77/CMakeLists.txt
     examples/smpi/energy/f90/CMakeLists.txt
+  examples/python/CMakeLists.txt
+  examples/deprecated/java/CMakeLists.txt
+  examples/deprecated/msg/CMakeLists.txt
+    examples/deprecated/msg/mc/CMakeLists.txt
+  examples/deprecated/simdag/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
@@ -1058,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