X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a900e749d942065563de611d63900beeae7100a..2b7169d7fde3cf29ad25eeca9834af6f2de73826:/buildtools/Cmake/Modules/FindPCRE.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 69e8af876a..95fe8a868f 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -10,16 +10,7 @@ find_library(PATH_PCRE_LIB
     /opt/local
     /opt/csw
     /sw
-    /usr)
-message(status "PATH_PCRE_LIB ${PATH_PCRE_LIB}")
-string(REGEX MATCH ".dll.a" operation "${PATH_PCRE_LIB}")
-
-if(NOT operation)
-    if(WIN32)
-           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE_STATIC")
-    endif(WIN32)
-endif(NOT operation)
-
+    /usr)  
 
 find_path(PATH_PCRE_H "pcre.h"
     HINTS
@@ -33,8 +24,6 @@ find_path(PATH_PCRE_H "pcre.h"
     /opt/csw
     /sw
     /usr)
-       
-set(HAVE_PCRE_LIB 0)
 
 message(STATUS "Looking for pcre.h")
 if(PATH_PCRE_H)
@@ -50,46 +39,16 @@ else(PATH_PCRE_LIB)
 message(STATUS "Looking for lib pcre - not found")
 endif(PATH_PCRE_LIB)
 
-if(WIN32)
-    find_path(PATH_PCRE_LICENCE "LICENCE"
-        HINTS
-        $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-        $ENV{LD_LIBRARY_PATH}
-        $ENV{PCRE_LIBRARY_PATH}
-        PATH_SUFFIXES GnuWin32
-        PATHS
-        /opt
-        /opt/local
-        /opt/csw
-        /sw
-        /usr)
-    message(STATUS "Looking for pcre licence")
-    if(PATH_PCRE_LICENCE)
-    message(STATUS "Looking for pcre licence - found")
-    else(PATH_PCRE_LICENCE)
-    message(STATUS "Looking for pcre licence - not found")
-    endif(PATH_PCRE_LICENCE)
-endif(WIN32)
-
 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)	   
-       set(HAVE_PCRE_LIB 1)
+  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)
-		if(enable_pcre STREQUAL "ON")
-			message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using it.")
-		else(enable_pcre STREQUAL "ON")
-			message(STATUS "Warning: You should install libpcre (please install the libpcre3-dev package or equivalent).")
-		endif(enable_pcre STREQUAL "ON")
+	   message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
-    
+
+set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
+
 mark_as_advanced(PATH_PCRE_H)
 mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file