X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6aac8bb90869cf0dccc9caf03be425af62ee2813..588d84fc8adffb87bdde21f3b6d8c410b54d53cc:/buildtools/Cmake/Modules/FindPCRE.cmake diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake index 0b3db37a89..51cd61341b 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) - -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 @@ -48,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}") @@ -83,6 +53,8 @@ if(PATH_PCRE_LIB AND PATH_PCRE_H) 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) - + +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