47 lines
1.5 KiB
Text
47 lines
1.5 KiB
Text
--- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000
|
|
+++ client/CMakeLists.txt 2014-12-03 09:22:09.860599069 +0000
|
|
@@ -33,6 +33,7 @@
|
|
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
# mysqltest has unused result errors, so we skip Werror
|
|
@@ -42,6 +43,7 @@
|
|
ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
|
|
ENDIF()
|
|
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
|
|
+ENDIF()
|
|
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
@@ -53,15 +55,19 @@
|
|
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
|
|
@@ -78,7 +84,7 @@
|
|
MYSQL_ADD_EXECUTABLE(echo echo.c)
|
|
ENDIF(WIN32)
|
|
|
|
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin
|
|
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|
|
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|