mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-07 06:17:14 +02:00
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
--- ./client/CMakeLists.txt.orig
|
|
+++ ./client/CMakeLists.txt
|
|
@@ -28,44 +28,44 @@
|
|
ADD_DEFINITIONS(${READLINE_DEFINES})
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
|
|
-TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql libmysql mysqlclient)
|
|
IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
|
|
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 libmysql mysqlclient regex)
|
|
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlcheck libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
|
|
-TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqldump libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlimport libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
|
|
-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql_upgrade libmysql mysqlclient)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlshow libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
-TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysql_plugin libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
-TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqlbinlog libmysql mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
|
|
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
|
|
+TARGET_LINK_LIBRARIES(mysqladmin libmysql mysqlclient)
|
|
|
|
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 libmysql mysqlclient)
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|