40a0e27769
Changes happened into format of --version which caused r450384 Reviewed by: mat (mentor) Approved by: mat (mentor) Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D12579
33 lines
1.2 KiB
Text
33 lines
1.2 KiB
Text
--- utilities/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ utilities/CMakeLists.txt
|
|
@@ -45,6 +45,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/
|
|
@@ -73,6 +74,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)
|
|
@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
|
|
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
|
|
ADD_DEPENDENCIES(innochecksum GenError)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
+IF(FALSE)
|
|
IF(UNIX)
|
|
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
|
|
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
# In published release builds on Solaris, we need to bundle gcc source.
|
|
# PB2 will take care of putting it in extra/ when needed
|