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/oqgraph | |
| 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/oqgraph')
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
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}) |