HPCC-15252 Remove separate Cassandra plugin package

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -117,7 +117,6 @@ if ( PLUGIN )
     HPCC_ADD_SUBDIRECTORY (rtl/eclrtl)
     HPCC_ADD_SUBDIRECTORY (system/jlib)
     HPCC_ADD_SUBDIRECTORY (dali/base)
-    HPCC_ADD_SUBDIRECTORY (common/workunit "CASSANDRAEMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/Rembed "REMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/v8embed "V8EMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/memcached "MEMCACHED")
@@ -125,7 +124,6 @@ if ( PLUGIN )
     HPCC_ADD_SUBDIRECTORY (plugins/redis "REDIS")
     HPCC_ADD_SUBDIRECTORY (plugins/javaembed "JAVAEMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/kafka "KAFKA")
-    HPCC_ADD_SUBDIRECTORY (plugins/cassandra "CASSANDRAEMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/sqlite3 "SQLITE3EMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/mysql "MYSQLEMBED")
 elseif ( NOT MAKE_DOCS_ONLY )

cmake_modules/commonSetup.cmake

@@ -49,7 +49,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(DEVEL "Enable the building/inclusion of a Development component." OFF)
   option(CLIENTTOOLS_ONLY "Enable the building of Client Tools only." OFF)
   option(INCLUDE_PLUGINS "Enable the building of platform and all plugins for testing purposes" OFF)
-  option(INCLUDE_CASSANDRA "Include the Cassandra plugin in the base package" ON)
+  option(USE_CASSANDRA "Include the Cassandra plugin in the base package" ON)
   option(PLUGIN "Enable building of a plugin" OFF)
   option(USE_SHLIBDEPS "Enable the use of dpkg-shlibdeps on ubuntu packaging" OFF)
 
@@ -107,7 +107,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(MYSQLEMBED "Create a package with ONLY the mysql plugin" OFF)
   option(JAVAEMBED "Create a package with ONLY the javaembed plugin" OFF)
   option(SQLITE3EMBED "Create a package with ONLY the sqlite3embed plugin" OFF)
-  option(CASSANDRAEMBED "Create a package with ONLY the cassandraembed plugin" OFF)
   option(KAFKA "Create a package with ONLY the kafkaembed plugin" OFF)
 
   if (APPLE OR WIN32)
@@ -122,7 +121,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
 
     if(REMBED OR V8EMBED OR MEMCACHED OR PYEMBED OR REDIS OR JAVAEMBED OR MYSQLEMBED
-        OR SQLITE3EMBED OR CASSANDRAEMBED OR KAFKA)
+        OR SQLITE3EMBED OR KAFKA)
         set(PLUGIN ON)
         set(CLIENTTOOLS OFF)
         set(PLATFORM OFF)
@@ -186,13 +185,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
             set(pluginname "sqlite3embed")
         endif()
     endif()
-    if(CASSANDRAEMBED)
-	    if(DEFINED pluginname)
-	        message(FATAL_ERROR "Cannot enable cassandraembed, already declared ${pluginname}")
-        else()
-            set(pluginname "cassandraembed")
-        endif()
-    endif()
     if(KAFKA)
 	    if(DEFINED pluginname)
 	        message(FATAL_ERROR "Cannot enable kafka, already declared ${pluginname}")
@@ -236,14 +228,9 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         set(MYSQLEMBED ON)
         set(JAVAEMBED ON)
         set(SQLITE3EMBED ON)
-        set(CASSANDRAEMBED ON)
         set(KAFKA ON)
     endif()
 
-  if (INCLUDE_CASSANDRA)
-    set(CASSANDRAEMBED ON)
-  endif()
-
   option(PORTALURL "Set url to hpccsystems portal download page")
 
   if ( NOT PORTALURL )

plugins/cassandra/CMakeLists.txt

@@ -24,7 +24,7 @@
 
 project(cassandraembed)
 
-if(CASSANDRAEMBED)
+if(USE_CASSANDRA)
     # There is not yet a standard package for cassandra cpp client, and only very modern distros have libuv-dev
     # When there is (and the distros catch up) we may want to add them as dependencies here
     ADD_PLUGIN(cassandraembed)