summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-01-23 18:50:47 +0100
committerSergei Golubchik <serg@mariadb.org>2019-01-24 10:34:05 +0100
commitedeba0c8733409865c3abcab881af0d48b7be94f (patch)
treeb897406c5b22162353deef87d044113f9f3ec7a9
parenta0f3b9f94f3094ccb9ce75c53b25d36c4c78e922 (diff)
downloadmariadb-git-edeba0c8733409865c3abcab881af0d48b7be94f.tar.gz
MDEV-17868 mysqltest fails to link with system PCRE libraries
pcre needs symbols from pcreposix (but this is only an issue when linking with system static libraries)
-rw-r--r--client/CMakeLists.txt2
-rw-r--r--libmysqld/examples/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c75abd4956d..c760a9dbf14 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -41,7 +41,7 @@ ENDIF(UNIX)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
+TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index d47638ad2f9..1eb07a2adf8 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 pcre pcreposix)
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcreposix pcre)
IF(CMAKE_GENERATOR MATCHES "Xcode")
# It does not seem possible to tell Xcode the resulting target might need