From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 14 Jun 2012 13:27:07 +0000 (+0200)
Subject: Ensure that additional include/link directories for libpcre are added at the end... 
X-Git-Tag: v3_8~606
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2b7169d7fde3cf29ad25eeca9834af6f2de73826

Ensure that additional include/link directories for libpcre are added at the end of the list.

Otherwise, there is the risk to used older versions of the SimGrid includes.

Hope this won't break anything...
---

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 51cd61341b..95fe8a868f 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -40,16 +40,10 @@ message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
 
 if(PATH_PCRE_LIB AND PATH_PCRE_H)
-       string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATHLIBPCRE "${PATH_PCRE_LIB}")
-       string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-       string(REGEX MATCH "-L${PATHLIBPCRE} " operation "${CMAKE_C_FLAGS}")
-	   if(NOT operation)
-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${PATHLIBPCRE} ")
-	   endif(NOT operation)
-	   string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-	   if(NOT operation)
-			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-	   endif(NOT operation)	   
+  string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATH_PCRE_LIB "${PATH_PCRE_LIB}")
+  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
+  include_directories(${PATH_PCRE_H})
+  link_directories(${PATH_PCRE_LIB})
 else(PATH_PCRE_LIB)
 	   message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)