diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-12 12:26:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-15 22:14:33 +0100 |
| commit | db227616d2ac4529041f37dbc4b6cd5e0338c4a1 (patch) | |
| tree | b65c2a8f49fe57f5bd61264544bb1aeba46bc011 /storage/cassandra | |
| parent | 985ef1d42a7b71c72aa3b26d96f0876ac597522f (diff) | |
| download | mariadb-git-db227616d2ac4529041f37dbc4b6cd5e0338c4a1.tar.gz | |
followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins"
Remove ONLY_IF clause in MYSQL_ADD_PLUGIN and the requirement
that every plugin's CMakeLists.txt *must* do MYSQL_ADD_PLUGIN
for PLUGIN_XXX=YES to work. This was very fragile and cannot be
relied on.
Use a different implementation of =YES check - iterate all
PLUGIN_* variables and see which one doesn't have a matching target.
Revert all ONLY_IF changes in CMakeLists.txt files.
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 43b33f712cc..df097c90a47 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -51,9 +51,6 @@ 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) - -MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE - ONLY_IF CASSANDRASE_OK - MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) - |