move header template near to its destination

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c55ea8c..f934f2f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,8 +515,8 @@ endif()
 #############################################
 
 # Avoid triggering a (full) rebuild by touching the files if they did not really change
-configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h.generated"    @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/config.h.in"          "${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/src/internal_config.h.in"    "${CMAKE_BINARY_DIR}/src/internal_config.h.generated"    @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated" @ONLY IMMEDIATE)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/internal_config.h.generated ${CMAKE_BINARY_DIR}/src/internal_config.h)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h)
 file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated)

diff --git a/tools/cmake/src/internal_config.h.in b/src/internal_config.h.in
similarity index 97%
rename from tools/cmake/src/internal_config.h.in
rename to src/internal_config.h.in
index b33d58d..795d389 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/src/internal_config.h.in
@@ -1,7 +1,7 @@
 /* internal_config.h -- characteristics of the platform, as probed by Cmake */
 
 /* Warning: The file internal_config.h is AUTOMATICALLY GENERATED by Cmake.
- * Edit the template instead: tools/cmake/src/internal_config.h.in          */
+ * Edit the template instead: src/internal_config.h.in                      */
 
 /* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 050a082..502a62f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -785,6 +785,7 @@ set(headers_to_install
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  src/internal_config.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper
@@ -1077,7 +1078,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
-  tools/cmake/src/internal_config.h.in
   tools/cmake/test_prog/prog_asan.cpp
   tools/cmake/test_prog/prog_makecontext.c
   tools/cmake/test_prog/prog_stackgrowth.c