50c1016581
MariaDB is a multi-threaded SQL database with a command syntax very similar to mSQL. ok sthen@ giovanni@
71 lines
3.0 KiB
Plaintext
71 lines
3.0 KiB
Plaintext
$OpenBSD: patch-client_CMakeLists_txt,v 1.1.1.1 2013/04/04 18:58:44 brad Exp $
|
|
--- client/CMakeLists.txt.orig Tue Jan 29 09:12:49 2013
|
|
+++ client/CMakeLists.txt Thu Feb 14 22:14:16 2013
|
|
@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
|
|
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
|
|
-TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql clientlib libmysql mysys)
|
|
IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
|
|
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
|
|
@@ -36,38 +36,38 @@ 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 regex)
|
|
+TARGET_LINK_LIBRARIES(mysqltest clientlib libmysql mysys regex)
|
|
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
|
|
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlcheck clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
|
|
-TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqldump clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlimport clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
|
|
-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql_upgrade clientlib libmysql mysys)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlshow clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
-TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql_plugin clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
-TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlbinlog clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
|
|
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqladmin clientlib libmysql mysys)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
-TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlslap clientlib libmysql mysys)
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|
|
@@ -76,7 +76,7 @@ ENDIF(WIN32)
|
|
|
|
# async_example is just a code example, do not install it.
|
|
ADD_EXECUTABLE(async_example async_example.c)
|
|
-TARGET_LINK_LIBRARIES(async_example mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(async_example clientlib libmysql mysys)
|
|
|
|
SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
|
|
PROPERTIES HAS_CXX TRUE)
|