From 7231563937d42af5f91cd118217b51c5914e1993 Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Mon, 29 May 2017 15:13:49 +0300
Subject: [PATCH] Always use bundled Pcre2 library

Some additions to config.cc will require a recent version of PCRE2.
The system libraries may not be up to date. The pcre2 source is
bundled with MaxScale anyway, so using it is a simple way of controlling
the library version.
---
 CMakeLists.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11a55902e..85e9f8229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,15 +46,11 @@ find_package(Avro)
 find_package(GSSAPI)
 find_package(SQLite)
 
-# Find or build PCRE2
+# Build PCRE2 so we always know the version
 # Read BuildPCRE2 for details about how to add pcre2 as a dependency to a target
-find_package(PCRE2)
-if(NOT PCRE2_FOUND)
-  message(STATUS "Using bundled PCRE2 library")
-  include(cmake/BuildPCRE2.cmake)
-endif()
+include(cmake/BuildPCRE2.cmake)
 
-include_directories(${PCRE2_INCLUDE_DIRS})
+include_directories(BEFORE ${PCRE2_INCLUDE_DIRS})
 
 # If the connector was not found, download and build it from source
 if(NOT MARIADB_CONNECTOR_FOUND)