From 277ee016a50f4b19a110d69cc8c3501fc29cd694 Mon Sep 17 00:00:00 2001
From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 19 Jan 2018 15:20:39 +1100
Subject: [PATCH] pcre: do not explode if pcre is missing

---
 cmake/pcre.cmake                | 6 ++++--
 tools/hscollider/CMakeLists.txt | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake
index 30b33b88..acad45bd 100644
--- a/cmake/pcre.cmake
+++ b/cmake/pcre.cmake
@@ -35,7 +35,8 @@ if (PCRE_BUILD_SOURCE)
 
     if (NOT CORRECT_PCRE_VERSION)
         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()
         message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} - building from source.")
     endif()
@@ -55,7 +56,8 @@ else ()
     if (PCRE_FOUND)
         message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION}")
     else ()
-        message(FATAL_ERROR "PCRE version ${PCRE_REQUIRED_VERSION} not found")
+        message(STATUS "PCRE version ${PCRE_REQUIRED_VERSION} not found")
+        return ()
     endif ()
 endif (PCRE_BUILD_SOURCE)
 
diff --git a/tools/hscollider/CMakeLists.txt b/tools/hscollider/CMakeLists.txt
index 7efcef42..f05b444f 100644
--- a/tools/hscollider/CMakeLists.txt
+++ b/tools/hscollider/CMakeLists.txt
@@ -4,6 +4,10 @@ set(PCRE_REQUIRED_MINOR_VERSION 41)
 set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
 
 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})