Fredrik Fornwall
7 years ago
2 changed files with 36 additions and 0 deletions
@ -0,0 +1,11 @@ |
|||
diff -u -r ../mariadb-10.2.7/CMakeLists.txt ./CMakeLists.txt
|
|||
--- ../mariadb-10.2.7/CMakeLists.txt 2017-07-10 10:53:26.000000000 +0000
|
|||
+++ ./CMakeLists.txt 2017-08-09 23:44:24.691181837 +0000
|
|||
@@ -386,7 +386,6 @@
|
|||
OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) |
|||
IF(WITH_EMBEDDED_SERVER) |
|||
ADD_SUBDIRECTORY(libmysqld) |
|||
- ADD_SUBDIRECTORY(libmysqld/examples)
|
|||
ENDIF(WITH_EMBEDDED_SERVER) |
|||
|
|||
IF(WITH_WSREP) |
@ -0,0 +1,25 @@ |
|||
diff -u -r ../mariadb-10.2.7/client/CMakeLists.txt ./client/CMakeLists.txt
|
|||
--- ../mariadb-10.2.7/client/CMakeLists.txt 2017-07-10 10:53:27.000000000 +0000
|
|||
+++ ./client/CMakeLists.txt 2017-08-09 23:33:34.537797770 +0000
|
|||
@@ -43,12 +43,6 @@
|
|||
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}) |
|||
|
|||
@@ -93,7 +87,7 @@
|
|||
PROPERTIES HAS_CXX TRUE) |
|||
|
|||
|
|||
-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
|
|||
+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
|
|||
mysqladmin mysqlslap async_example) |
|||
ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) |
|||
ENDFOREACH() |
Loading…
Reference in new issue