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

pcre: do not explode if pcre is missing

Browse Source
This commit is contained in:
Matthew Barr 2018-01-19 15:20:39 +11:00 committed by Xiang Wang
parent 905a67375a
commit 277ee016a5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/pcre.cmake
View File

@ -35,7 +35,8 @@ 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(FATAL_ERROR "Incorrect version of pcre - version ${PCRE_REQUIRED_VERSION} is required") message(STATUS "Incorrect version of pcre - version ${PCRE_REQUIRED_VERSION} is required")
return ()
else() else()
message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} - building from source.") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} - building from source.")
endif() endif()
@ -55,7 +56,8 @@ else ()
if (PCRE_FOUND) if (PCRE_FOUND)
message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION}") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION}")
else () else ()
message(FATAL_ERROR "PCRE version ${PCRE_REQUIRED_VERSION} not found") message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} not found")
return ()
endif () endif ()
endif (PCRE_BUILD_SOURCE) endif (PCRE_BUILD_SOURCE)

4
tools/hscollider/CMakeLists.txt
View File

@ -4,6 +4,10 @@ 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)
message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found, not building hscollider")
return()
endif()
include_directories(${PCRE_INCLUDE_DIRS}) include_directories(${PCRE_INCLUDE_DIRS})