mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
9337706bbe
The problem was not caused by a change in the client, rather by the tests using the Windows built-in "echo" and not the one built by MySQL. This again happened because the binary was missing in the package, caused by the wrong macro being used to build it in "cmake".
74 lines
2.6 KiB
CMake
74 lines
2.6 KiB
CMake
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
INCLUDE_DIRECTORIES(
|
|
${CMAKE_SOURCE_DIR}/include
|
|
${ZLIB_INCLUDE_DIR}
|
|
${SSL_INCLUDE_DIRS}
|
|
${CMAKE_SOURCE_DIR}/libmysql
|
|
${CMAKE_SOURCE_DIR}/regex
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
${CMAKE_SOURCE_DIR}/strings
|
|
${READLINE_INCLUDE_DIR}
|
|
${CMAKE_CURRENT_BINARY_DIR}
|
|
)
|
|
|
|
ADD_DEFINITIONS(${READLINE_DEFINES})
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
|
|
TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
|
|
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
|
|
TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
|
|
TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|
|
MYSQL_ADD_EXECUTABLE(echo echo.c)
|
|
ENDIF(WIN32)
|
|
|
|
SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|