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 c3d8881..6378849 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -362,7 +362,7 @@ set(RNGSTREAM_SRC
        src/rngstreams/RngStream.c
 )
 
        src/rngstreams/RngStream.c
 )
 

-set(install_HEADERS
+set(headers_to_install

        include/xbt/misc.h
        include/xbt/sysdep.h
        include/xbt/virtu.h
        include/xbt/misc.h
        include/xbt/sysdep.h
        include/xbt/virtu.h


@@ -431,11 +431,6 @@ set(source_of_generated_headers
        include/smpi/smpif.h.in
        src/context_sysv_config.h.in)
 
        include/smpi/smpif.h.in
        src/context_sysv_config.h.in)
 

-set(GENERATE_HEADERS
-       ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
-       ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
-)
-

 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
 if(${CONTEXT_THREADS}) #pthread
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
 if(${CONTEXT_THREADS}) #pthread


@@ -820,7 +815,7 @@ buildtools/Cmake/tesh.pl
 
 # This is the complete list of what will be added to the source archive
 set(source_to_pack     
 
 # 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}
        ${source_of_generated_headers}
        ${XBT_RL_SRC}
        ${EXTRA_DIST}