X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/34b70bf538f38282b52626b2542801f1deec25ca..88425d917174073213cea8943fa31eb0049cb84d:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8b885e6f86..985e9a995d 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -93,6 +93,7 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
+  src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
   src/smpi/smpi_c99.c
@@ -186,6 +187,8 @@ set(SURF_SRC
   src/surf/cpu_cas01.c
   src/surf/cpu_ti.c
   src/surf/fair_bottleneck.c
+  src/surf/instr_routing.c
+  src/surf/instr_surf.c
   src/surf/lagrange.c
   src/surf/maxmin.c
   src/surf/network.c
@@ -196,7 +199,6 @@ set(SURF_SRC
   src/surf/storage.c
   src/surf/surf.c
   src/surf/surf_action.c
-  src/surf/surf_config.c
   src/surf/surf_model.c
   src/surf/surf_routing.c
   src/surf/surf_routing_cluster.c
@@ -231,9 +233,14 @@ set(SIMIX_SRC
   src/simix/smx_user.c
   )
 
+set(SIMGRID_SRC
+  src/simgrid/sg_config.c
+  )
+
 set(MSG_SRC
+  src/msg/instr_msg_process.c
+  src/msg/instr_msg_task.c
   src/msg/msg_actions.c
-  src/msg/msg_config.c
   src/msg/msg_deployment.c
   src/msg/msg_environment.c
   src/msg/msg_global.c
@@ -313,11 +320,8 @@ set(LUA_SRC
   )
 
 set(TRACING_SRC
-  src/simgrid/sg_config.c
   src/instr/instr_config.c
   src/instr/instr_interface.c
-  src/instr/instr_msg_process.c
-  src/instr/instr_msg_task.c
   src/instr/instr_paje_containers.c
   src/instr/instr_paje_trace.c
   src/instr/instr_paje_header.c
@@ -325,9 +329,6 @@ set(TRACING_SRC
   src/instr/instr_paje_values.c
   src/instr/instr_private.h
   src/instr/instr_resource_utilization.c
-  src/instr/instr_routing.c
-  src/instr/instr_smpi.c
-  src/instr/instr_surf.c
   )
 
 set(JEDULE_SRC
@@ -459,15 +460,40 @@ endif()
 set(simgrid_sources
   ${BINDINGS_SRC}
   ${GTNETS_USED}
-  ${JEDULE_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
+  ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
+  ${SMPI_SRC}
   ${TRACING_SRC}
   ${XBT_SRC}
   )
 
+if(${HAVE_JEDULE})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${JEDULE_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${JEDULE_SRC}
+    )
+endif()
+
+if(${HAVE_TRACING})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${TRACING_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${TRACING_SRC}
+    )
+endif()
+
 if(HAVE_MC)
   set(simgrid_sources
     ${simgrid_sources}
@@ -730,6 +756,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_thread_storage.c
   buildtools/Cmake/test_prog/prog_va_copy.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
+  buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
   )
 
 set(PLATFORMS_EXAMPLES