X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfa93d95a4bfe18c937124bd12451d9537bf08ba..96453425fde36fe9a39551552d5f88778da97235:/buildtools/Cmake/Modules/FindPCRE.cmake

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index e2537eb1c6..9f4398fd93 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -1,6 +1,7 @@
 find_library(PATH_PCRE_LIB 
 	NAMES pcre
     HINTS
+    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
     $ENV{LD_LIBRARY_PATH}
     $ENV{PCRE_LIBRARY_PATH}
     PATH_SUFFIXES lib/ GnuWin32/lib
@@ -9,11 +10,11 @@ find_library(PATH_PCRE_LIB
     /opt/local
     /opt/csw
     /sw
-    /usr
-    /lib)
+    /usr)
     
 find_path(PATH_PCRE_H "pcre.h"
     HINTS
+    $ENV{SIMGRID_PCRE_LIBRARY_PATH}
     $ENV{LD_LIBRARY_PATH}
     $ENV{PCRE_LIBRARY_PATH}
     PATH_SUFFIXES include/ GnuWin32/include
@@ -25,6 +26,21 @@ find_path(PATH_PCRE_H "pcre.h"
     /usr)
     
 set(HAVE_PCRE_LIB 0)
+
+message(STATUS "Looking for pcre.h")
+if(PATH_PCRE_H)
+message(STATUS "Looking for pcre.h - found")
+else(PATH_PCRE_H)
+message(STATUS "Looking for pcre.h - not found")
+endif(PATH_PCRE_H)
+
+message(STATUS "Looking for lib pcre")
+if(PATH_PCRE_LIB)
+message(STATUS "Looking for lib pcre - found")
+else(PATH_PCRE_LIB)
+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}")
@@ -38,19 +54,12 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
 	   endif(NOT operation)	   
        set(HAVE_PCRE_LIB 1)
 else(PATH_PCRE_LIB)
-		message(STATUS "Warning : You should install libpcre (please install the libpcre3-dev package or equivalent)")
+		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")
 endif(PATH_PCRE_LIB AND PATH_PCRE_H)
     
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - found")
-else(PATH_PCRE_H)
-message(STATUS "Looking for pcre.h - not found")
-endif(PATH_PCRE_H)
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - found")
-else(PATH_PCRE_LIB)
-message(STATUS "Looking for lib pcre - not found")
-endif(PATH_PCRE_LIB)
\ No newline at end of file
+mark_as_advanced(PATH_PCRE_H)
+mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file