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 66fa585..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


@@ -34,8 +33,8 @@ set(EXTRA_DIST
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp

-  src/smpi/include/private.h

   src/smpi/include/private.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


@@ -72,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
 


@@ -276,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


@@ -289,7 +286,7 @@ set(XBT_SRC
   src/xbt/xbt_log_layout_format.c
   src/xbt/xbt_log_layout_simple.c
   src/xbt/xbt_main.cpp
   src/xbt/xbt_log_layout_format.c
   src/xbt/xbt_log_layout_simple.c
   src/xbt/xbt_main.cpp

-  src/xbt/xbt_os_file.c
+  src/xbt/xbt_os_file.cpp

   src/xbt/xbt_os_synchro.cpp
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_os_synchro.cpp
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp


@@ -347,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


@@ -381,6 +379,7 @@ set(SIMIX_SRC
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp

+  src/kernel/context/ContextRaw.hpp

   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp


@@ -549,10 +548,15 @@ set(TRACING_SRC
   src/instr/instr_config.cpp
   src/instr/instr_interface.cpp
   src/instr/instr_paje_containers.cpp
   src/instr/instr_config.cpp
   src/instr/instr_interface.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_types.cpp
   src/instr/instr_paje_header.cpp
   src/instr/instr_paje_trace.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


@@ -573,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


@@ -716,12 +720,11 @@ set(headers_to_install
   include/xbt/ex.hpp
   include/xbt/exception.hpp
   include/xbt/Extendable.hpp
   include/xbt/ex.hpp
   include/xbt/exception.hpp
   include/xbt/Extendable.hpp

-  include/xbt/file.h
+  include/xbt/file.hpp

   include/xbt/functional.hpp
   include/xbt/function_types.h
   include/xbt/future.hpp
   include/xbt/graph.h
   include/xbt/functional.hpp
   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


@@ -766,9 +769,11 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext

-  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
+                                src/kernel/context/ContextUnix.cpp)

 else() # NOT ucontext
 else() # NOT ucontext

-  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
+                                src/kernel/context/ContextUnix.cpp)

 endif()
 
 ### Simgrid Lib sources
 endif()
 
 ### Simgrid Lib sources