From a8de1f413376d0e422ba49559243762ff7100fd3 Mon Sep 17 00:00:00 2001
From: Navarrop <Pierre.Navarro@imag.fr>
Date: Thu, 16 Jun 2011 16:11:23 +0200
Subject: [PATCH] Change name install_HEADERS for headers_to_install.
 Correctely set generated_files_to_clean.

---
 buildtools/Cmake/CompleteInFiles.cmake | 18 +++++++++++++-----
 buildtools/Cmake/DefinePackages.cmake  |  9 ++-------
 buildtools/Cmake/Distrib.cmake         |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index bf6d3e9d6f..2cea4e2c31 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -676,11 +676,19 @@ exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITO
 exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
 exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)
 
-set(generate_files_to_clean
-${CMAKE_BINARY_DIR}/src/context_sysv_config.h
-${CMAKE_BINARY_DIR}/src/gras_config.h
-${CMAKE_BINARY_DIR}/include/simgrid_config.h
-${CMAKE_BINARY_DIR}/include/smpi/smpif.h
+set(generated_headers_to_install
+	${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
+)
+
+set(generated_headers
+    ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h
+    ${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h
+)
+
+set(generated_files_to_clean
+${generated_headers}
+${generated_headers_to_install}
 ${CMAKE_BINARY_DIR}/bin/smpicc
 ${CMAKE_BINARY_DIR}/bin/smpif2c
 ${CMAKE_BINARY_DIR}/bin/smpiff
diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index e80411137e..e7f1d41ec6 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -358,7 +358,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
@@ -431,11 +431,6 @@ set(source_of_generated_headers
 	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
@@ -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	
-	${install_HEADERS}
+	${headers_to_install}
 	${source_of_generated_headers}
 	${XBT_RL_SRC}
 	${EXTRA_DIST}
diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 1ee02abcdc..81bf3206b0 100644
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -79,8 +79,8 @@ endif(enable_lib_static AND NOT WIN32)
 
 # include files
 set(HEADERS
-    ${install_HEADERS}
-    ${GENERATE_HEADERS}
+    ${headers_to_install}
+    ${generated_headers_to_install}
     )
 foreach(file ${HEADERS})
   get_filename_component(location ${file} PATH)
-- 
2.20.1