[trace] update the header to the latest paje file format (as observed in paje source...

[simgrid.git] / buildtools / Cmake / Modules / FindPCRE.cmake

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 93fd14d..51cd613 100644 (file)
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -10,8 +10,8 @@ find_library(PATH_PCRE_LIB
     /opt/local
     /opt/csw
     /sw
-    /usr)
-    
+    /usr)  
+
 find_path(PATH_PCRE_H "pcre.h"
     HINTS
     $ENV{SIMGRID_PCRE_LIBRARY_PATH}
@@ -24,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)
@@ -41,27 +39,6 @@ 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}")
@@ -73,14 +50,11 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H)
           if(NOT operation)
                        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
           endif(NOT operation)    
-       set(HAVE_PCRE_LIB 1)
 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