7164158100
- Port improvements from MySQL 5.7 port - Use system libs instead of bundled - Fix many open PRs - Change MAINTAINER PR: 216244 192657 198812 199751 205093 PR: 209618 211248 205983 209338
32 lines
1.2 KiB
Text
32 lines
1.2 KiB
Text
--- extra/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
|
|
+++ extra/CMakeLists.txt
|
|
@@ -35,6 +35,7 @@ ENDIF()
|
|
|
|
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
|
|
${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
|
|
+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
|
|
COMMAND comp_err
|
|
--charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
|
|
--out-dir=${PROJECT_BINARY_DIR}/sql/share/
|
|
@@ -60,6 +61,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
|
|
ENDIF()
|
|
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
|
|
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
|
|
SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
|
|
@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
|
|
MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
|
|
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(UNIX)
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
|
|
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
|
|
TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
|