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

diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
index 5eb24f8a4c..2e46c9b1e6 100644
--- a/buildtools/Cmake/Modules/FindPCRE.cmake
+++ b/buildtools/Cmake/Modules/FindPCRE.cmake
@@ -1,88 +1,52 @@
-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
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /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_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
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /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
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr)
+  HINTS
+  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
+  $ENV{LD_LIBRARY_PATH}
+  $ENV{PCRE_LIBRARY_PATH}
+  PATH_SUFFIXES include/ GnuWin32/include
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr)
 
 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 pcre.h - found")
+else()
+  message(STATUS "Looking for pcre.h - not found")
+endif()
 
 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(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)
+  message(STATUS "Looking for lib pcre - found")
+else()
+  message(STATUS "Looking for lib pcre - not found")
+endif()
 
 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)	   
-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)
+  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()
+  message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
+endif()
 
 set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})