From 0f7698660d1ad8ab24d92e4c746d521de60e23be Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 25 Mar 2010 12:42:42 +0000 Subject: [PATCH 1/1] Fix a bug with Fedora. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7371 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/src/CMakeCompleteInFiles.txt | 4 ++-- buildtools/Cmake/src/CMakeMakeExeLib.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt index 901a025089..87f8e57fc6 100644 --- 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) diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt index 260b7c4240..e5810ab266 100644 --- a/buildtools/Cmake/src/CMakeMakeExeLib.txt +++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt @@ -52,8 +52,8 @@ target_link_libraries(simgrid_static ${SIMGRID_DEP} -fprofile-arcs) target_link_libraries(gras ${GRAS_DEP} -fprofile-arcs) target_link_libraries(smpi simgrid ${SMPI_DEP} -fprofile-arcs) -SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid") -SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib") +#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid") +#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib") ### Make EXEs -- 2.20.1