cleanup: innodb files in cmake/

moved to storage/innobase/

also removed duplicate checks from storage/innobase/CMakeLists.txt
(they're all in storage/innobase/innodb.cmake)

5 files changed, 0 insertions, 202 deletions

diff --git a/cmake/bzip2.cmake b/cmake/bzip2.cmake
deleted file mode 100644
index 0c15853d0b9..00000000000
--- a/cmake/bzip2.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2014, SkySQL Ab. 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
-
-SET(WITH_INNODB_BZIP2 AUTO CACHE STRING
-  "Build with bzip2. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
-
-MACRO (MYSQL_CHECK_BZIP2)
-  IF (WITH_INNODB_BZIP2 STREQUAL "ON" OR WITH_INNODB_BZIP2 STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(bzlib.h HAVE_BZLIB2_H)
-    CHECK_LIBRARY_EXISTS(bz2 BZ2_bzBuffToBuffCompress "" HAVE_BZLIB2_COMPRESS)
-    CHECK_LIBRARY_EXISTS(bz2 BZ2_bzBuffToBuffDecompress "" HAVE_BZLIB2_DECOMPRESS)
-
-    IF (HAVE_BZLIB2_COMPRESS AND HAVE_BZLIB2_DECOMPRESS AND HAVE_BZLIB2_H)
-      ADD_DEFINITIONS(-DHAVE_BZIP2=1)
-      LINK_LIBRARIES(bz2) 
-    ELSE()
-      IF (WITH_INNODB_BZIP2 STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required bzip2 library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()
diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
deleted file mode 100644
index 075904589f0..00000000000
--- a/cmake/lz4.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2014, SkySQL Ab. 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
-
-SET(WITH_INNODB_LZ4 AUTO CACHE STRING
-  "Build with lz4. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
-
-MACRO (MYSQL_CHECK_LZ4)
-  IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
-    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
-    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
-
-    IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
-      ADD_DEFINITIONS(-DHAVE_LZ4=1)
-      IF (HAVE_LZ4_COMPRESS_DEFAULT)
-	ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
-      ENDIF()
-      LINK_LIBRARIES(lz4)
-    ELSE()
-      IF (WITH_INNODB_LZ4 STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required lz4 library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-
-MACRO (MYSQL_CHECK_LZ4_STATIC)
- IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
-   CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
-   CHECK_LIBRARY_EXISTS(liblz4.a LZ4_compress_limitedOutput "" HAVE_LZ4_LIB)
-   CHECK_LIBRARY_EXISTS(liblz3.a LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
-
-   IF(HAVE_LZ4_LIB AND HAVE_LZ4_H)
-     ADD_DEFINITIONS(-DHAVE_LZ4=1)
-      IF (HAVE_LZ4_COMPRESS_DEFAULT)
-	ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
-      ENDIF()
-     LINK_LIBRARIES(liblz4.a)
-   ELSE()
-      IF (WITH_INNODB_LZ4 STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required lz4 library is not found")
-      ENDIF()
-   ENDIF()
- ENDIF()
-ENDMACRO()
diff --git a/cmake/lzma.cmake b/cmake/lzma.cmake
deleted file mode 100644
index 12a28a17a43..00000000000
--- a/cmake/lzma.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2014, SkySQL Ab. 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
-
-SET(WITH_INNODB_LZMA AUTO CACHE STRING
-  "Build with lzma. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
-
-MACRO (MYSQL_CHECK_LZMA)
-  IF (WITH_INNODB_LZMA STREQUAL "ON" OR WITH_INNODB_LZMA STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(lzma.h HAVE_LZMA_H)
-    CHECK_LIBRARY_EXISTS(lzma lzma_stream_buffer_decode "" HAVE_LZMA_DECODE)
-    CHECK_LIBRARY_EXISTS(lzma lzma_easy_buffer_encode "" HAVE_LZMA_ENCODE)
-
-    IF (HAVE_LZMA_DECODE AND HAVE_LZMA_ENCODE AND HAVE_LZMA_H)
-      ADD_DEFINITIONS(-DHAVE_LZMA=1)
-      LINK_LIBRARIES(lzma) 
-    ELSE()
-      IF (WITH_INNODB_LZMA STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required lzma library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()
diff --git a/cmake/lzo.cmake b/cmake/lzo.cmake
deleted file mode 100644
index 07cba011c06..00000000000
--- a/cmake/lzo.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2014, SkySQL Ab. 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
-
-SET(WITH_INNODB_LZO AUTO CACHE STRING
-  "Build with lzo. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
-
-MACRO (MYSQL_CHECK_LZO_STATIC)
-  IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
-    CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
-
-    IF(HAVE_LZO_LIB AND HAVE_LZO_H)
-      ADD_DEFINITIONS(-DHAVE_LZO=1)
-      LINK_LIBRARIES(liblzo2.a)
-    ELSE()
-      IF (WITH_INNODB_LZO STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required lzo library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-
-MACRO (MYSQL_CHECK_LZO)
-  IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
-    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
-
-    IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
-      ADD_DEFINITIONS(-DHAVE_LZO=1)
-      LINK_LIBRARIES(lzo2)
-    ELSE()
-      IF (WITH_INNODB_LZO STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required lzo library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()
diff --git a/cmake/snappy.cmake b/cmake/snappy.cmake
deleted file mode 100644
index cb0839a3480..00000000000
--- a/cmake/snappy.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2015, MariaDB Corporation. 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
-
-SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
-  "Build with snappy. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
-
-MACRO (MYSQL_CHECK_SNAPPY)
-  IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
-    CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
-    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
-
-    IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
-      ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
-      LINK_LIBRARIES(snappy)
-    ELSE()
-      IF (WITH_INNODB_SNAPPY STREQUAL "ON")
-	MESSAGE(FATAL_ERROR "Required snappy library is not found")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDMACRO()