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 8a4b47f..cff4bca 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -6,10 +6,9 @@ set(EXTRA_DIST
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.h

-  src/include/smpi/smpi_utils.hpp

   src/include/surf/datatypes.h
   src/include/surf/maxmin.hpp
   src/include/surf/datatypes.h
   src/include/surf/maxmin.hpp

-  src/include/surf/surf.h
+  src/include/surf/surf.hpp

   src/include/xbt/parmap.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/include/xbt/parmap.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp


@@ -35,6 +34,7 @@ set(EXTRA_DIST
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp

+  src/smpi/include/smpi_utils.hpp

   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp


@@ -71,7 +71,6 @@ set(EXTRA_DIST
   src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
   src/xbt/graph_private.h
   src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
   src/xbt/graph_private.h

-  src/xbt/heap_private.h

   src/xbt/log_private.h
   src/xbt/mallocator_private.h
 
   src/xbt/log_private.h
   src/xbt/mallocator_private.h
 


@@ -275,7 +274,6 @@ set(XBT_SRC
   src/xbt/ex.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c
   src/xbt/ex.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c

-  src/xbt/heap.c

   src/xbt/log.c
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/log.c
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp


@@ -346,6 +344,7 @@ set(SURF_SRC
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
   src/surf/plugins/host_energy.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
   src/surf/plugins/host_energy.cpp

+  src/surf/plugins/link_energy.cpp

   src/surf/plugins/host_load.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp
   src/surf/plugins/host_load.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp


@@ -548,13 +547,16 @@ set(LUA_SRC
 set(TRACING_SRC
   src/instr/instr_config.cpp
   src/instr/instr_interface.cpp
 set(TRACING_SRC
   src/instr/instr_config.cpp
   src/instr/instr_interface.cpp

-  src/instr/instr_paje_containers.hpp

   src/instr/instr_paje_containers.cpp
   src/instr/instr_paje_containers.cpp

+  src/instr/instr_paje_containers.hpp
+  src/instr/instr_paje_events.cpp
+  src/instr/instr_paje_events.hpp

   src/instr/instr_paje_header.cpp
   src/instr/instr_paje_trace.cpp
   src/instr/instr_paje_header.cpp
   src/instr/instr_paje_trace.cpp

-  src/instr/instr_paje_types.hpp

   src/instr/instr_paje_types.cpp
   src/instr/instr_paje_types.cpp

+  src/instr/instr_paje_types.hpp

   src/instr/instr_paje_values.cpp
   src/instr/instr_paje_values.cpp

+  src/instr/instr_paje_values.hpp

   src/instr/instr_private.hpp
   src/instr/instr_smpi.hpp
   src/instr/instr_resource_utilization.cpp
   src/instr/instr_private.hpp
   src/instr/instr_smpi.hpp
   src/instr/instr_resource_utilization.cpp


@@ -575,7 +577,7 @@ set(MC_SRC_BASE
   src/mc/mc_base.cpp
   src/mc/mc_base.h
   src/mc/mc_record.hpp
   src/mc/mc_base.cpp
   src/mc/mc_base.h
   src/mc/mc_record.hpp

-  src/mc/mc_replay.h
+  src/mc/mc_replay.hpp

   src/mc/mc_record.cpp
   src/mc/mc_config.cpp
   src/mc/mc_global.cpp
   src/mc/mc_record.cpp
   src/mc/mc_config.cpp
   src/mc/mc_global.cpp


@@ -723,7 +725,6 @@ set(headers_to_install
   include/xbt/function_types.h
   include/xbt/future.hpp
   include/xbt/graph.h
   include/xbt/function_types.h
   include/xbt/future.hpp
   include/xbt/graph.h

-  include/xbt/heap.h

   include/xbt/log.h
   include/xbt/log.hpp
   include/xbt/mallocator.h
   include/xbt/log.h
   include/xbt/log.hpp
   include/xbt/mallocator.h