github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update PCRE version to 8.42 (8.41 is also compatible)

Browse Source
This commit is contained in:
Chang, Harry 2018-12-20 15:28:07 +08:00
parent c06d5e1c14
commit f13cbd692e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -456,7 +456,7 @@ set(PCRE_REQUIRED_MINOR_VERSION 41)
set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION}) set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
include (${CMAKE_MODULE_PATH}/pcre.cmake) include (${CMAKE_MODULE_PATH}/pcre.cmake)
if (NOT CORRECT_PCRE_VERSION) if (NOT CORRECT_PCRE_VERSION)
message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found") message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} or above not found")
endif() endif()
# we need static libs for Chimera - too much deep magic for shared libs # we need static libs for Chimera - too much deep magic for shared libs
@ -508,7 +508,7 @@ set(PCRE_REQUIRED_MINOR_VERSION 41)
set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION}) set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
include (${CMAKE_MODULE_PATH}/pcre.cmake) include (${CMAKE_MODULE_PATH}/pcre.cmake)
if (NOT CORRECT_PCRE_VERSION) if (NOT CORRECT_PCRE_VERSION)
message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found") message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} or above not found")
endif() endif()
# we need static libs for Chimera - too much deep magic for shared libs # we need static libs for Chimera - too much deep magic for shared libs

12
cmake/pcre.cmake
View File

@ -27,7 +27,7 @@ if (PCRE_BUILD_SOURCE)
# first, check version number # first, check version number
CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic> CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic>
#if PCRE_MAJOR != ${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR != ${PCRE_REQUIRED_MINOR_VERSION} #if PCRE_MAJOR != ${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR < ${PCRE_REQUIRED_MINOR_VERSION}
#error Incorrect pcre version #error Incorrect pcre version
#endif #endif
main() {}" CORRECT_PCRE_VERSION) main() {}" CORRECT_PCRE_VERSION)
@ -35,10 +35,10 @@ if (PCRE_BUILD_SOURCE)
if (NOT CORRECT_PCRE_VERSION) if (NOT CORRECT_PCRE_VERSION)
unset(CORRECT_PCRE_VERSION CACHE) unset(CORRECT_PCRE_VERSION CACHE)
message(STATUS "Incorrect version of pcre - version ${PCRE_REQUIRED_VERSION} is required") message(STATUS "Incorrect version of pcre - version ${PCRE_REQUIRED_VERSION} or above is required")
return () return ()
else() else()
message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} - building from source.") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} or above - building from source.")
endif() endif()
# PCRE compile options # PCRE compile options
@ -52,12 +52,12 @@ if (PCRE_BUILD_SOURCE)
else () else ()
# pkgconf should save us # pkgconf should save us
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(PCRE libpcre=${PCRE_REQUIRED_VERSION}) pkg_check_modules(PCRE libpcre>=${PCRE_REQUIRED_VERSION})
if (PCRE_FOUND) if (PCRE_FOUND)
set(CORRECT_PCRE_VERSION TRUE) set(CORRECT_PCRE_VERSION TRUE)
message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION}") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} or above")
else () else ()
message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} not found") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} or above not found")
return () return ()
endif () endif ()
endif (PCRE_BUILD_SOURCE) endif (PCRE_BUILD_SOURCE)

2
doc/dev-reference/compilation.rst
View File

@ -64,7 +64,7 @@ libpcre are supported. The use of unsupported constructs will result in
compilation errors. compilation errors.
The version of PCRE used to validate Hyperscan's interpretation of this syntax The version of PCRE used to validate Hyperscan's interpretation of this syntax
is 8.41. is 8.41 or above.
==================== ====================
Supported Constructs Supported Constructs