diff options
| -rw-r--r-- | BUILD/cmake_configure.sh | 2 | ||||
| -rw-r--r-- | cmake/cat.cmake | 28 | ||||
| -rw-r--r-- | cmake/check_minimal_version.cmake | 20 | ||||
| -rw-r--r-- | cmake/compile_flags.cmake | 44 | ||||
| -rw-r--r-- | cmake/ctest.cmake | 2 |
5 files changed, 2 insertions, 94 deletions
diff --git a/BUILD/cmake_configure.sh b/BUILD/cmake_configure.sh index 668d6a81b5c..5d7c317f86f 100644 --- a/BUILD/cmake_configure.sh +++ b/BUILD/cmake_configure.sh @@ -18,7 +18,7 @@ # MA 02110-1301, USA # Ensure cmake and perl are there -cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no +cmake --help >/dev/null 2>&1 || HAVE_CMAKE=no perl --version >/dev/null 2>&1 || HAVE_PERL=no scriptdir=`dirname $0` if test "$HAVE_CMAKE" = "no" diff --git a/cmake/cat.cmake b/cmake/cat.cmake deleted file mode 100644 index 1ffe2ecfa1d..00000000000 --- a/cmake/cat.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2009 Sun Microsystems, Inc. -# Use is subject to license terms. -# -# 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 - -# Concatenate files -# -# Parameters : -# IN - input files (list) -# OUT - output file -FILE(WRITE ${OUT} "") -FOREACH(FILENAME ${IN}) - FILE(READ ${FILENAME} CONTENTS) - FILE(APPEND ${OUT} "${CONTENTS}") -ENDFOREACH() - - diff --git a/cmake/check_minimal_version.cmake b/cmake/check_minimal_version.cmake deleted file mode 100644 index d96c6a93418..00000000000 --- a/cmake/check_minimal_version.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2009 Sun Microsystems, Inc. -# Use is subject to license terms. -# -# 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 - -# This is a helper script is used to check for the minimal required version -# It helps to decide whether to use autoconf based configure or cmake's -# configure -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR) diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake deleted file mode 100644 index b39bf7b79d6..00000000000 --- a/cmake/compile_flags.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2014, 2015, 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 - - -## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>) -MACRO(ADD_COMPILE_FLAGS) - SET(FILES "") - SET(FLAGS "") - SET(COMPILE_FLAGS_SEEN) - FOREACH(ARG ${ARGV}) - IF(ARG STREQUAL "COMPILE_FLAGS") - SET(COMPILE_FLAGS_SEEN 1) - ELSEIF(COMPILE_FLAGS_SEEN) - LIST(APPEND FLAGS ${ARG}) - ELSE() - LIST(APPEND FILES ${ARG}) - ENDIF() - ENDFOREACH() - FOREACH(FILE ${FILES}) - FOREACH(FLAG ${FLAGS}) - GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS) - IF(NOT PROP) - SET(PROP ${FLAG}) - ELSE() - SET(PROP "${PROP} ${FLAG}") - ENDIF() - SET_SOURCE_FILES_PROPERTIES( - ${FILE} PROPERTIES COMPILE_FLAGS "${PROP}" - ) - ENDFOREACH() - ENDFOREACH() -ENDMACRO() diff --git a/cmake/ctest.cmake b/cmake/ctest.cmake index 08852a366f6..d29a655fc57 100644 --- a/cmake/ctest.cmake +++ b/cmake/ctest.cmake @@ -5,7 +5,7 @@ MACRO(MY_ADD_TEST name) ADD_TEST(${name} ${name}-t) ENDMACRO() -MACRO (MY_ADD_TESTS) +MACRO(MY_ADD_TESTS) MYSQL_PARSE_ARGUMENTS(ARG "LINK_LIBRARIES;EXT" "" ${ARGN}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include |