--- client/CMakeLists.txt.orig	2016-03-03 16:35:33.000000000 +0100
+++ client/CMakeLists.txt	2016-04-19 17:30:13.344558659 +0200
@@ -37,9 +37,11 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
 ENDIF(UNIX)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 ADD_DEPENDENCIES(mysqltest GenError)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 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)
@@ -81,8 +87,6 @@ IF(WIN32)
 ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (
-  mysql_plugin 
-  mysql_upgrade
   mysqlcheck
   mysqldump
   mysqlimport