From 53c574844a785bc0437165692ded76080b30f7ab Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 08:54:19 +0000 Subject: [PATCH] Add Lib path correctly. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8276 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/CompleteInFiles.cmake | 12 +++++++++--- src/simdag/sd_dotloader.c | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 065e67f321..77b1af5835 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -181,11 +181,14 @@ mark_as_advanced(HAVE_CGRAPH_H) if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H) string(REGEX REPLACE "/libcgraph.*" "" lib_cgraph ${HAVE_CGRAPH_LIB}) string(REPLACE "/cgraph.h" "" file_cgraph_h ${HAVE_CGRAPH_H}) - string(REGEX MATCH "-I${file_cgraph_h} " operation "${CMAKE_C_FLAGS}") if(NOT operation) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${file_cgraph_h} ") endif(NOT operation) + string(REGEX MATCH "-L${lib_cgraph} " operation "${CMAKE_C_FLAGS}") + if(NOT operation) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${lib_cgraph} ") + endif(NOT operation) endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H) @@ -194,8 +197,11 @@ endif(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H) find_library(PCRE_LIB pcre "/usr/lib/" ) if(PATH_PCRE_LIB) - string(REGEX REPLACE "libpcre.*[.]so$" "" PATHLIBPCRE "${PCRE_LIB}") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ") + string(REGEX REPLACE "/libpcre.*[.]so$" "" PATHLIBPCRE "${PCRE_LIB}") + string(REGEX MATCH "-L${PATHLIBPCRE} " operation "${CMAKE_C_FLAGS}") + if(NOT operation) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ") + endif(NOT operation) set(HAVE_PCRE_LIB 1) endif(PATH_PCRE_LIB) diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index 3749926bda..1c96d2bbe5 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd,"Parsing DOT files"); #undef CLEANUP -#include +#include void dot_add_task(Agnode_t *dag_node) ; void dot_add_input_dependencies(SD_task_t current_job, Agedge_t *edge) ; -- 2.20.1