302d685ac6
- Add mariadb102-client port - Add RocksDB storage engine - Add non-base page compressors - First sweep at making cmake patches upstreamable
78 lines
2.9 KiB
Text
78 lines
2.9 KiB
Text
--- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
|
|
SET(CLIENT_LIB mariadbclient mysys)
|
|
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
+
|
|
+IF(NOT WITHOUT_CLIENT)
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
|
|
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
|
|
TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB})
|
|
@@ -43,11 +45,6 @@ IF(UNIX)
|
|
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
|
|
ENDIF(UNIX)
|
|
|
|
-MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix)
|
|
-SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
|
|
-
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
|
|
@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
|
|
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
|
|
|
|
-MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
|
|
-TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
|
|
-ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
-
|
|
-MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
-TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
|
|
-
|
|
-MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
-TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
|
|
-
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
|
|
|
|
@@ -89,14 +76,34 @@ ENDIF(WIN32)
|
|
ADD_EXECUTABLE(async_example async_example.c)
|
|
TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
|
|
|
|
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
|
|
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|
|
-
|
|
-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
|
|
+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog
|
|
mysqladmin mysqlslap async_example)
|
|
ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
|
|
ENDFOREACH()
|
|
|
|
+ENDIF()
|
|
+
|
|
+MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
+SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
+TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix)
|
|
+SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
|
|
+
|
|
+MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
|
|
+TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
|
|
+ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
+
|
|
+MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
+TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
|
|
+
|
|
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
|
|
+PROPERTIES HAS_CXX TRUE)
|
|
+
|
|
+FOREACH(t mysqltest mysql_plugin mysql_upgrade)
|
|
+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
|
|
+ENDFOREACH()
|
|
+
|
|
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|
|
|