database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #1376 from benthompson15/MCOL-4155

Browse Source 
Fix for using correct cnf file when building as submodule.
This commit is contained in:
David.Hall
2020-08-19 18:45:51 -05:00
committed by GitHub
parent e1cbf2d33a be60b49646
commit 39557da2f5
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dbcon/mysql/CMakeLists.txt
View File

@ -38,9 +38,18 @@ if (COMMAND mysql_add_plugin)
IF(NOT(RPM OR DEB)) IF(NOT(RPM OR DEB))
SET(disabled DISABLED) SET(disabled DISABLED)
ENDIF() ENDIF()
FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/)
if (BUILD_CONFIG STREQUAL "enterprise")
FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf)
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf")
else ()
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
endif ()
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled} mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
COMPONENT columnstore-engine) COMPONENT columnstore-engine CONFIG ${CS_CNF_FILE})
else () else ()
add_library(ha_columnstore SHARED ${libcalmysql_SRCS}) add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
@ -53,6 +62,15 @@ else ()
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist) # define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
add_custom_target(columnstore DEPENDS ha_columnstore) add_custom_target(columnstore DEPENDS ha_columnstore)
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 () endif ()
if (TARGET columnstore) if (TARGET columnstore)
@ -65,14 +83,4 @@ if (TARGET columnstore)
DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine) DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)
install(PROGRAMS install_mcs_mysql.sh install(PROGRAMS install_mcs_mysql.sh
DESTINATION ${ENGINE_SBINDIR} COMPONENT columnstore-engine) DESTINATION ${ENGINE_SBINDIR} 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() endif()