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

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 003520b..6378849 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -91,6 +91,14 @@ set(EXTRA_DIST
        src/smpi/smpi_mpi_dt_private.h
        src/smpi/README
        src/mk_supernovae.pl
+       
+       examples/gras/ping/ping.h
+       examples/gras/console/ping.h
+       examples/gras/mmrpc/mmrpc.h
+
+       tools/gras/gras_stub_generator.h
+       tools/tesh/run_context.h  
+       tools/tesh/tesh.h
 )
 
 set(XBT_RL_SRC 
@@ -319,8 +327,6 @@ set(TRACING_SRC
        src/instr/instr_paje_trace.c
        src/instr/instr_msg_task.c
        src/instr/instr_msg_process.c
-       src/instr/instr_msg_volume.c
-       src/instr/instr_smx.c
        src/instr/instr_surf.c
        src/instr/instr_smpi.c
        src/instr/instr_simdag.c
@@ -356,7 +362,7 @@ set(RNGSTREAM_SRC
        src/rngstreams/RngStream.c
 )
 
-set(install_HEADERS
+set(headers_to_install
        include/xbt/misc.h
        include/xbt/sysdep.h
        include/xbt/virtu.h
@@ -376,6 +382,7 @@ set(install_HEADERS
        include/xbt/graph.h
        include/xbt/fifo.h
        include/xbt/swag.h
+       include/xbt/lib.h
        include/xbt/matrix.h
        include/xbt/peer.h
        include/xbt/config.h
@@ -396,9 +403,9 @@ set(install_HEADERS
        include/simdag/simdag.h
        include/simdag/datatypes.h
        include/smpi/smpi.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
        include/smpi/mpi.h
        include/smpi/mpif.h
+       include/smpi/smpi_cocci.h
        include/surf/surfxml_parse.h
        include/surf/simgrid_dtd.h
        include/surf/surf_routing.h
@@ -413,13 +420,16 @@ set(install_HEADERS
        include/amok/peermanagement.h
        include/amok/bandwidth.h
        include/instr/instr.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
        include/gras.h 
        include/xbt.h
        include/simix/simix.h
        include/simix/datatypes.h
        include/simix/context.h
 )
+set(source_of_generated_headers
+       include/simgrid_config.h.in
+       include/smpi/smpif.h.in
+       src/context_sysv_config.h.in)
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
@@ -676,17 +686,6 @@ set(add_src_files
        src/simix/smx_context_sysv_private.h
 )
 
-file(GLOB_RECURSE include_files
-"include/*.h"
-"teshsuite/*.h"
-"testsuite/*.h"
-"tools/*.h"
-"examples/*.h"
-"examples/*.hpp"
-"src/*.h.in"
-"include/*.h.in"
-)
-
 file(GLOB_RECURSE xml_files
 "examples/*.xml"
 "include/*.xml"
@@ -816,7 +815,8 @@ buildtools/Cmake/tesh.pl
 
 # This is the complete list of what will be added to the source archive
 set(source_to_pack     
-       ${install_HEADERS}
+       ${headers_to_install}
+       ${source_of_generated_headers}
        ${XBT_RL_SRC}
        ${EXTRA_DIST}
        ${SMPI_SRC}
@@ -836,7 +836,6 @@ set(source_to_pack
        ${JEDULE_SRC}
        ${RNGSTREAM_SRC}
        ${add_src_files}
-       ${include_files}
        ${xml_files}
        ${tesh_files}
        ${txt_files}