Update findPCRE module.

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 69e8af8..5f22069 100644 (file)
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -11,12 +11,12 @@ find_library(PATH_PCRE_LIB
     /opt/csw
     /sw
     /usr)
     /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)
 string(REGEX MATCH ".dll.a" operation "${PATH_PCRE_LIB}")
 
 if(NOT operation)
     if(WIN32)

-           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE_STATIC")
+           set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-DPCRE_STATIC ")

     endif(WIN32)
 endif(NOT operation)
 
     endif(WIN32)
 endif(NOT operation)
 

diff --git a/doc/HelloWorld/FindPCRE.cmake b/doc/HelloWorld/FindPCRE.cmake
index 9454da7..e6f382b 100644 (file)
--- a/doc/HelloWorld/FindPCRE.cmake
+++ b/doc/HelloWorld/FindPCRE.cmake
@@ -13,6 +13,7 @@ endif(APPLE)
 find_library(PATH_PCRE_LIB 
        NAMES pcre
     HINTS
 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
     $ENV{LD_LIBRARY_PATH}
     $ENV{PCRE_LIBRARY_PATH}
     PATH_SUFFIXES lib/ GnuWin32/lib


@@ -23,8 +24,17 @@ find_library(PATH_PCRE_LIB
     /sw
     /usr)
     
     /sw
     /usr)
     

+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)
+

 find_path(PATH_PCRE_H "pcre.h"
     HINTS
 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
     $ENV{LD_LIBRARY_PATH}
     $ENV{PCRE_LIBRARY_PATH}
     PATH_SUFFIXES include/ GnuWin32/include


@@ -51,6 +61,27 @@ else(PATH_PCRE_LIB)
 message(STATUS "Looking for lib pcre - not found")
 endif(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}")
 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}")