X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c02e1f29787b34a3fda957da0ecaeba632dbc29d..56c47af676825844d0a1c0bc8b5fce9c9da765f1:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e5a6f89ac5..6084499eb4 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}
@@ -701,6 +713,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
@@ -866,6 +879,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 +904,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 +940,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