Fix a bug with Fedora.

[simgrid.git] / buildtools / Cmake / src / CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 8869aa8..87f8e57 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -219,8 +219,8 @@ if(NOT disable_lua)
 
        if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
                set(HAVE_LUA 1)
-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
-               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H}")
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H} ")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${HAVE_LUA5_1_LUALIB_H} -I${HAVE_LUA5_1_LAUXLIB_H} ")
        endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 
        if(LUA_LIB_PATH_1)
@@ -671,15 +671,11 @@ 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)
 
-=======
-configure_file(${PROJECT_DIRECTORY}/src/smpicc.in ${PROJECT_DIRECTORY}/src/smpi/smpicc @ONLY)
-configure_file(${PROJECT_DIRECTORY}/src/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY)
 exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpicc" OUTPUT_VARIABLE OKITOKI)
 exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE OKITOKI)
->>>>>>> Compile smpi examples with smpicc. Fix lualib location problem with Fedora.:buildtools/Cmake/src/CMakeCompleteInFiles.txt
 
 #message("__END_GRAS_&_SIMGRID____\n")