diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
| commit | 8e80f91fa3e584d6b681bfbb4664e80a255af866 (patch) | |
| tree | af4f13f6f0290ee72b33a0642aa7c03e4e5fcd1c /sql/CMakeLists.txt | |
| parent | 63108dc9d2cc9f31ae9927817652be465a17f767 (diff) | |
| parent | 3ee8aa216d55b858ba9e53874359dcac9a82933a (diff) | |
| download | mariadb-git-8e80f91fa3e584d6b681bfbb4664e80a255af866.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index dacc731b34e..7172294e4f6 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. +# Copyright (c) 2010, 2015, MariaDB # # 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 @@ -253,14 +254,15 @@ IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED) ENDIF() FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar - tar bzr git) + tar git) STRING(TOUPPER ${tool} TOOL) FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable") MARK_AS_ADVANCED(${TOOL}_EXECUTABLE) ENDFOREACH() CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY) + ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in + ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY) ADD_CUSTOM_TARGET(dist COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/make_dist.cmake @@ -270,8 +272,7 @@ ADD_CUSTOM_TARGET(dist ADD_CUSTOM_TARGET(distclean COMMAND ${CMAKE_COMMAND} -E echo WARNING: distclean target is not functional - COMMAND ${CMAKE_COMMAND} -E echo Use 'bzr clean-tree' with --unknown and/or - --ignored parameter instead + COMMAND ${CMAKE_COMMAND} -E echo Use 'git clean -fdx' instead VERBATIM ) |