Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-client/files/patch-client_CMakeLists.txt
--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 | --- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC | ||||
+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 | +++ client/CMakeLists.txt | ||||
@@ -38,11 +38,12 @@ | @@ -38,11 +38,12 @@ IF(UNIX) | ||||
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) | SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) | ||||
ENDIF(UNIX) | ENDIF(UNIX) | ||||
+IF(FALSE) | +IF(FALSE) | ||||
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | ||||
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) | TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) | ||||
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) | SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) | ||||
- | - | ||||
+ENDIF() | +ENDIF() | ||||
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | ||||
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | ||||
@@ -53,21 +54,25 @@ | @@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim | ||||
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | ||||
+IF(FALSE) | +IF(FALSE) | ||||
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) | MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) | ||||
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | ||||
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ||||
+ENDIF() | +ENDIF() | ||||
Show All 9 Lines | |||||
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | ||||
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) | MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) | ||||
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | -TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | ||||
+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | +tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) | ||||
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | ||||
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
@@ -79,10 +84,12 @@ | @@ -80,10 +85,12 @@ IF(WIN32) | ||||
ENDIF(WIN32) | ENDIF(WIN32) | ||||
# async_example is just a code example, do not install it. | # async_example is just a code example, do not install it. | ||||
+IF(FALSE) | +IF(FALSE) | ||||
ADD_EXECUTABLE(async_example async_example.c) | ADD_EXECUTABLE(async_example async_example.c) | ||||
TARGET_LINK_LIBRARIES(async_example mysqlclient) | TARGET_LINK_LIBRARIES(async_example mysqlclient) | ||||
+ENDIF() | +ENDIF() | ||||
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example | -SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example | ||||
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap | +SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap | ||||
PROPERTIES HAS_CXX TRUE) | PROPERTIES HAS_CXX TRUE) | ||||
ADD_DEFINITIONS(-DHAVE_DLOPEN) | ADD_DEFINITIONS(-DHAVE_DLOPEN) |