diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-12-17 01:37:59 +0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-21 10:34:02 +0100 |
| commit | 9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7 (patch) | |
| tree | 5fd6298b3dfe07cc08bd6ffebbe65081818c13ac /libmysqld | |
| parent | ce70573f6255d2720c39309e0d41e181dab2d685 (diff) | |
| download | mariadb-git-9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7.tar.gz | |
MDEV-14024 PCRE2.
Related changes in the server code.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index d910d354631..73e089af4d0 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -154,7 +154,7 @@ ENDIF() SET(LIBS - dbug strings mysys mysys_ssl pcre vio + dbug strings mysys mysys_ssl pcre2-8 vio ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${EMBEDDED_PLUGIN_LIBS} diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 52fbe42aaa2..f94bc4ba969 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -34,7 +34,7 @@ ENDIF(UNIX) MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc COMPONENT Test) -TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcreposix pcre) +TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcre2-8 pcre2-posix) IF(CMAKE_GENERATOR MATCHES "Xcode") # It does not seem possible to tell Xcode the resulting target might need |