summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-04 01:22:53 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-04 01:22:53 +0100
commit016bd4fc5fff311dc4091b3b7329cd980dbaa14b (patch)
tree4d208f3494087c6bc289a911336580e3d6d91e34 /CMakeLists.txt
parent8705d00ab62b4d3f749b4b8cba07718e8fd54bcb (diff)
downloadmariadb-git-016bd4fc5fff311dc4091b3b7329cd980dbaa14b.tar.gz
MDEV-5620 CMake option to compile against an external PCRE library
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4859bb89e0b..f8ebddc70fe 100644
--- a/CMakeLists.txt
+++ b/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)