From c4c833db81bfe0a8631d28976f89a55a1f042fb9 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 23 Mar 2010 14:30:35 +0000 Subject: [PATCH] Rename gras_config.h.in to c_gras_config.h.in in order to avoid a conflict with autotools git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7319 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 2 +- buildtools/Cmake/src/{gras_config.h.in => c_gras_config.h.in} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename buildtools/Cmake/src/{gras_config.h.in => c_gras_config.h.in} (100%) diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index 913a936b84..0ec3510c49 100644 --- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt +++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt @@ -635,7 +635,7 @@ CHECK_INCLUDE_FILE(string.h HAVE_STRING_H) configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${PROJECT_DIRECTORY}/src/context_sysv_config.h) SET( CMAKEDEFINE "#cmakedefine" ) -configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE) +configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE) configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" "${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE) configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${PROJECT_DIRECTORY}/include/simgrid_config.h) diff --git a/buildtools/Cmake/src/gras_config.h.in b/buildtools/Cmake/src/c_gras_config.h.in similarity index 100% rename from buildtools/Cmake/src/gras_config.h.in rename to buildtools/Cmake/src/c_gras_config.h.in -- 2.20.1