diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2011-10-07 09:46:50 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2011-10-07 09:46:50 +0000 |
| commit | 7c285d805015ed2e7414087dd934ed23e1f91fca (patch) | |
| tree | 5038b29085e597a91bb79c72f51bcc0994a07b61 /databases/mysql55-server/files/patch-client_CMakeLists.txt | |
| parent | - Fix PKGNAME and UNIQUENAME. (diff) | |
Update to 5.5.16 release.
Diffstat (limited to 'databases/mysql55-server/files/patch-client_CMakeLists.txt')
| -rw-r--r-- | databases/mysql55-server/files/patch-client_CMakeLists.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt index b36a0f4c1791..2c5864188b98 100644 --- a/databases/mysql55-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql55-server/files/patch-client_CMakeLists.txt @@ -1,5 +1,5 @@ ---- client/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ client/CMakeLists.txt 2010-12-23 18:01:04.000000000 +0100 +--- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200 ++++ client/CMakeLists.txt 2011-10-07 11:06:21.000000000 +0200 @@ -27,17 +27,20 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -46,11 +49,13 @@ +@@ -46,17 +49,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -34,8 +34,16 @@ +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) + TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -63,13 +68,14 @@ +@@ -66,13 +73,14 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) @@ -46,8 +54,8 @@ MYSQL_ADD_EXECUTABLE(echo echo.c) ENDIF(WIN32) --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap -+SET_TARGET_PROPERTIES (mysql_upgrade +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin ++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) |