From 30d3930f96bd30bc3c1963788c6e468e46be2107 Mon Sep 17 00:00:00 2001 From: benthompson15 Date: Wed, 12 Aug 2020 15:21:32 -0500 Subject: [PATCH] MCOL-4155: rename the cnf file for enterprise builds. --- dbcon/mysql/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index cf5e53f13..4614ab319 100644 --- a/dbcon/mysql/CMakeLists.txt +++ b/dbcon/mysql/CMakeLists.txt @@ -66,6 +66,13 @@ if (TARGET columnstore) install(PROGRAMS install_mcs_mysql.sh DESTINATION ${ENGINE_SBINDIR} COMPONENT columnstore-engine) - install(FILES columnstore.cnf - DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine) + if(BUILD_CONFIG STREQUAL "enterprise") + message(STATUS "enterprise build: columnstore.cnf renamed to x-columnstore.cnf on install") + install(FILES columnstore.cnf + RENAME x-columnstore.cnf + DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine) + else() + install(FILES columnstore.cnf + DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine) + endif() endif()