From 1e8eaa0550dc6617f9e5d334cf2ba1c63db28df5 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <vuvova@gmail.com>
Date: Tue, 30 Jun 2020 16:04:09 +0200
Subject: [PATCH] fix RPM detection

RPM|DEB is not a valid cmake condition

Also: DRY
---
 dbcon/mysql/CMakeLists.txt | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 0a489b759..9f005ed8a 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -35,16 +35,12 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
 set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
 
 if (COMMAND mysql_add_plugin)
-    IF(RPM|DEB)
-        mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT
-            LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
-            COMPONENT columnstore-engine)
-    ELSE()
-        mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DISABLED
-            LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
-            COMPONENT columnstore-engine)
-    ENDIF()
-
+  IF(NOT(RPM OR DEB))
+    SET(disabled DISABLED)
+  ENDIF()
+  mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
+      LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
+      COMPONENT columnstore-engine)
 else ()
     add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
     SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")