HPCC-29432 Ensure eclblas and cassandraembed are in platform

Signed-off-by: Michael Gardner <[email protected]>
hpcc-systems · Jul 24, 2023 · 78079c1 · 78079c1
1 parent e24244a
commit 78079c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/cmake_modules/options.cmake b/cmake_modules/options.cmake
@@ -9,6 +9,7 @@ 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(USE_CASSANDRA "Include the Cassandra plugin in the base package" ON)
+option(USE_ECLBLAS "Include the ECLBLAS 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)
 

diff --git a/cmake_modules/plugins.cmake b/cmake_modules/plugins.cmake
@@ -26,9 +26,7 @@ set(VCPKG_INCLUDE "(windows | osx | linux)")
 set(VCPKG_SUPPRESS "(!windows & !osx & !linux)")
 
 set(PLUGINS_LIST
-    CASSANDRAEMBED
     COUCHBASEEMBED
-    ECLBLAS
     H3
     JAVAEMBED
     KAFKA

diff --git a/plugins/eclblas/CMakeLists.txt b/plugins/eclblas/CMakeLists.txt
@@ -26,9 +26,9 @@
 
 project(eclblas)
 
-if(ECLBLAS)
+if(ECLBLAS OR USE_ECLBLAS)
     ADD_PLUGIN(eclblas)
-    if(MAKE_ECLBLAS)
+    if(MAKE_ECLBLAS OR USE_ECLBLAS)
         find_package(OpenBLAS REQUIRED)
 
         add_definitions(-D_USE_CBLAS)