MDEV-5620 CMake option to compile against an external PCRE library

CMakeLists.txt

@@ -153,6 +153,7 @@ INCLUDE(readline)
 INCLUDE(libutils)
 INCLUDE(dtrace)
 INCLUDE(jemalloc)
+INCLUDE(pcre)
 INCLUDE(ctest)
 INCLUDE(plugin)
 INCLUDE(install_macros)
@@ -362,6 +363,8 @@ MYSQL_CHECK_READLINE()
 SET(MALLOC_LIBRARY "system")
 CHECK_JEMALLOC()
 
+CHECK_PCRE()
+
 #
 # Setup maintainer mode options. Platform checks are
 # not run with the warning options as to not perturb fragile checks
@@ -397,7 +400,6 @@ ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(dbug)
 ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
-ADD_SUBDIRECTORY(pcre)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(mysys_ssl)
 ADD_SUBDIRECTORY(libmysql)

client/CMakeLists.txt

@@ -15,8 +15,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
-  ${CMAKE_BINARY_DIR}/pcre
-  ${CMAKE_SOURCE_DIR}/pcre
+  ${PCRE_INCLUDES}
   ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}

cmake/jemalloc.cmake

@@ -46,7 +46,7 @@ ELSE()
 ENDIF()
 
 SET(WITH_JEMALLOC ${WITH_JEMALLOC_DEFAULT} CACHE STRING
-    "Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
+    "Which jemalloc to use. Possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
 
 MACRO (CHECK_JEMALLOC)
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")

cmake/pcre.cmake

+SET(WITH_PCRE "auto" CACHE STRING
+   "Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
+
+MACRO (CHECK_PCRE)
+  IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
+    CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE)
+  ENDIF()
+  IF(NOT HAVE_PCRE)
+    IF (WITH_PCRE STREQUAL "system")
+      MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
+    ENDIF()
+    SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre)
+    ADD_SUBDIRECTORY(pcre)
+  ENDIF()
+ENDMACRO()
+

cmake/plugin.cmake

@@ -37,8 +37,7 @@ MACRO(MYSQL_ADD_PLUGIN)
   # Add common include directories
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${SSL_INCLUDE_DIRS}
                     ${ZLIB_INCLUDE_DIR})
 

libmysql/CMakeLists.txt

@@ -17,8 +17,7 @@
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/libmysql
-  ${CMAKE_BINARY_DIR}/pcre
-  ${CMAKE_SOURCE_DIR}/pcre
+  ${PCRE_INCLUDES}
   ${CMAKE_SOURCE_DIR}/strings
   ${SSL_INCLUDE_DIRS}
   ${SSL_INTERNAL_INCLUDE_DIRS}

libmysqld/CMakeLists.txt

@@ -22,8 +22,7 @@ ${CMAKE_SOURCE_DIR}/libmysql
 ${CMAKE_SOURCE_DIR}/libmysqld
 ${CMAKE_SOURCE_DIR}/sql
 ${CMAKE_BINARY_DIR}/sql 
-${CMAKE_BINARY_DIR}/pcre
-${CMAKE_SOURCE_DIR}/pcre
+${PCRE_INCLUDES}
 ${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${SSL_INTERNAL_INCLUDE_DIRS}

libmysqld/examples/CMakeLists.txt

@@ -15,8 +15,7 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/sql
                     ${MY_READLINE_INCLUDE_DIR}
                     )

plugin/feedback/CMakeLists.txt

 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${SSL_INCLUDE_DIRS})
 
 SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc

plugin/qc_info/CMakeLists.txt

 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 MYSQL_ADD_PLUGIN(QUERY_CACHE_INFO qc_info.cc)

sql/CMakeLists.txt

@@ -16,8 +16,7 @@
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
 ${CMAKE_SOURCE_DIR}/sql 
-${CMAKE_BINARY_DIR}/pcre 
-${CMAKE_SOURCE_DIR}/pcre 
+${PCRE_INCLUDES}
 ${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${CMAKE_BINARY_DIR}/sql

storage/perfschema/CMakeLists.txt

@@ -16,8 +16,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 ADD_DEFINITIONS(-DMYSQL_SERVER)

storage/perfschema/unittest/CMakeLists.txt

@@ -15,8 +15,7 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/include/mysql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/sql
                     ${SSL_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/unittest/mytap

unittest/mysys/CMakeLists.txt

@@ -14,8 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 MY_ADD_TESTS(bitmap base64 my_vsnprintf my_atomic my_rdtsc lf my_malloc