diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2016-10-09 16:48:17 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2016-10-27 18:42:16 +0300 |
| commit | 1877a8cdb4bce5c14e4f92a08b959b84cc123c3f (patch) | |
| tree | 778b0b360805e51ca07d7d296567d4e890d4b54a /storage | |
| parent | d495bf42807c301da579e5de2ffcb39ea73df928 (diff) | |
| download | mariadb-git-1877a8cdb4bce5c14e4f92a08b959b84cc123c3f.tar.gz | |
MDEV-6284: Remove CMakeLists.txt hack that mangled the server install file
For Debian the rules file is the main makefile and assuming that a upstream
makefile will mangle the Debian packaging files creates false alerts
from static analysis tools and other problems.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/spider/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index df097c90a47..a5d58234d97 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -50,7 +50,6 @@ SET(cassandra_sources LINK_DIRECTORIES(${LINK_DIR}) IF(CASSANDRASE_OK) - SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE) MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) ENDIF(CASSANDRASE_OK) diff --git a/storage/spider/CMakeLists.txt b/storage/spider/CMakeLists.txt index 402c74b2cde..14c50f35bd9 100644 --- a/storage/spider/CMakeLists.txt +++ b/storage/spider/CMakeLists.txt @@ -41,7 +41,6 @@ ELSE() ${CMAKE_SOURCE_DIR}/storage/spider/scripts/install_spider.sql DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) - SET(SPIDER_DEB_FILES "usr/lib/mysql/plugin/ha_spider.so usr/share/mysql/install_spider.sql" PARENT_SCOPE) MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider") ENDIF() diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 765e6733a98..fd3bf90f8c4 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -35,7 +35,6 @@ ENDIF() MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) ############################################ -SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump" PARENT_SCOPE) MARK_AS_ADVANCED(BUILDNAME) MARK_AS_ADVANCED(BUILD_TESTING) MARK_AS_ADVANCED(CMAKE_TOKUDB_REVISION) |