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.

4 files changed, 14 insertions, 21 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)
-
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index 266ec31234e..2c09a27a581 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -50,17 +50,16 @@ IF(BOOST_OK)
 
   ADD_DEFINITIONS(-DBOOST_NO_RTTI=1 -DBOOST_NO_TYPEID=1 -DBOOST_DISABLE_ASSERTS=1)
   MESSAGE(STATUS "OQGraph OK")
+  MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc graphcore-graph.cc
+                   oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
+                   STORAGE_ENGINE
+                   MODULE_ONLY
+                   RECOMPILE_FOR_EMBEDDED
+                   COMPONENT oqgraph-engine
+                   LINK_LIBRARIES ${Judy_LIBRARIES})
 ELSE(BOOST_OK)
   MESSAGE(STATUS "Requisites for OQGraph not met. OQGraph will not be compiled")
 ENDIF(BOOST_OK)
 ENDFUNCTION()
 
 CHECK_OQGRAPH()
-MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc graphcore-graph.cc
-                 oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
-                 STORAGE_ENGINE
-                 ONLY_IF BOOST_OK
-                 MODULE_ONLY
-                 RECOMPILE_FOR_EMBEDDED
-                 COMPONENT oqgraph-engine
-                 LINK_LIBRARIES ${Judy_LIBRARIES})
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index b703278f3eb..24d4ffc12de 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -10,7 +10,6 @@ int main() { return 0; }
 ENDIF()
 
 IF(NOT TOKUDB_OK OR PLUGIN_TOKUDB STREQUAL "NO")
-  MYSQL_ADD_PLUGIN(tokudb DISABLED)
   RETURN()
 ENDIF()
 
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index f32bf5db360..4ba7a73e527 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -458,12 +458,10 @@ SET(INNOBASE_SOURCES
 	ut/ut0wqueue.cc
 	ut/ut0timer.cc)
 
-IF(NOT XTRADB_OK)
+IF(XTRADB_OK)
+  MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
+                   DEFAULT RECOMPILE_FOR_EMBEDDED
+                   LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
+ELSE()
   MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
 ENDIF()
-
-MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
-  DEFAULT ONLY_IF XTRADB_OK
-  RECOMPILE_FOR_EMBEDDED
-  LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
-