From d8140e3968ce48b88ed456a7a57f43d8b287f15b Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 25 Mar 2010 11:42:57 +0000 Subject: [PATCH] ??? What is it ??? git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7369 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index 8869aa80f3..33893583b1 100644 --- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt +++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt @@ -671,7 +671,7 @@ set(top_srcdir ${PROJECT_DIRECTORY}) set(includedir ${prefix}/include) set(top_builddir ${PROJECT_DIRECTORY}) set(libdir ${exec_prefix}/lib) -<<<<<<< HEAD:buildtools/Cmake/src/CMakeCompleteInFiles.txt + configure_file(${PROJECT_DIRECTORY}/src/smpi/smpicc.in ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY) configure_file(${PROJECT_DIRECTORY}/src/smpi/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY) -- 2.20.1