diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-12-18 17:51:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-21 10:35:07 +0100 |
| commit | 67f928d8c243c57f11ddfc8cd4217d5e55fb2c5f (patch) | |
| tree | 3cdda793ef3087e7243ea0de7af476484af007f6 /libmysqld | |
| parent | 3b654d54c1081ae9eab54bebe7093704749d31cf (diff) | |
| download | mariadb-git-67f928d8c243c57f11ddfc8cd4217d5e55fb2c5f.tar.gz | |
remove pcre, add support for bundled pcre2
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 73e089af4d0..cb84f46004a 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -154,7 +154,7 @@ ENDIF() SET(LIBS - dbug strings mysys mysys_ssl pcre2-8 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 f94bc4ba969..6b3bed6e50e 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 pcre2-8 pcre2-posix) +TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcre2-posix pcre2-8) IF(CMAKE_GENERATOR MATCHES "Xcode") # It does not seem possible to tell Xcode the resulting target might need |