Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 7e7bb5f..eb8ef77 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -90,8 +90,8 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
-  src/xbt/backtrace_dummy.c
-  src/xbt/backtrace_linux.c
+  src/xbt/backtrace_dummy.cpp
+  src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
   src/xbt/ex_interface.h
   src/xbt/fifo_private.h
@@ -215,7 +215,7 @@ set(SMPI_SRC
   src/smpi/colls/reduce-rab.c
   src/smpi/colls/scatter-ompi.c
   src/smpi/colls/scatter-mvapich-two-level.c
-  src/smpi/colls/smpi_automatic_selector.c
+  src/smpi/colls/smpi_automatic_selector.cpp
   src/smpi/colls/smpi_mpich_selector.c
   src/smpi/colls/smpi_intel_mpi_selector.c
   src/smpi/colls/smpi_openmpi_selector.c
@@ -244,13 +244,15 @@ set(XBT_SRC
   src/xbt/RngStream.c
   src/xbt/automaton/automaton.c
   src/xbt/automaton/automatonparse_promela.c
+  src/xbt/backtrace.cpp
   src/xbt/config.cpp
-  src/xbt/cunit.c
-  src/xbt/dict.c
+  src/xbt/cunit.cpp
+  src/xbt/dict.cpp
   src/xbt/dict_cursor.c
   src/xbt/dict_elm.c
-  src/xbt/dynar.c
-  src/xbt/ex.c
+  src/xbt/dynar.cpp
+  src/xbt/ex.cpp
+  src/xbt/exception.cpp
   src/xbt/fifo.c
   src/xbt/graph.c
   src/xbt/heap.c
@@ -271,8 +273,8 @@ set(XBT_SRC
   src/xbt/xbt_os_file.c
   src/xbt/xbt_os_synchro.c
   src/xbt/xbt_os_time.c
-  src/xbt/xbt_replay.c
-  src/xbt/xbt_str.c
+  src/xbt/xbt_replay.cpp
+  src/xbt/xbt_str.cpp
   src/xbt/xbt_strbuff.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
@@ -666,6 +668,9 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/dynar.hpp
   include/xbt/ex.h
+  include/xbt/exception.hpp
+  include/xbt/backtrace.h
+  include/xbt/backtrace.hpp
   include/xbt/fifo.h
   include/xbt/file.h
   include/xbt/function_types.h
@@ -676,6 +681,7 @@ set(headers_to_install
   include/xbt/lib.h
   include/xbt/Extendable.hpp
   include/xbt/log.h
+  include/xbt/log.hpp
   include/xbt/mallocator.h
   include/xbt/matrix.h
   include/xbt/memory.hpp
@@ -789,7 +795,6 @@ set(DOC_SOURCES
 
   doc/doxygen/FAQ.doc
   doc/doxygen/application.doc
-  doc/doxygen/bindings.doc
   doc/doxygen/community.doc
   doc/doxygen/community_contact.doc
   doc/doxygen/community_extend.doc
@@ -808,6 +813,7 @@ set(DOC_SOURCES
   doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
   doc/doxygen/install_yours.doc
+  doc/doxygen/java.doc
   doc/doxygen/tutorial.doc
   doc/doxygen/models.doc
   doc/doxygen/module-msg.doc
@@ -1088,7 +1094,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/torus_cluster.xml
   examples/platforms/two_clusters.xml
   examples/platforms/two_hosts.xml
-  examples/platforms/two_hosts_platform.xml
   examples/platforms/two_hosts_platform_shared.xml
   examples/platforms/two_hosts_platform_with_availability.xml
   examples/platforms/two_hosts_platform_with_availability_included.xml