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

MCOL-3625 Rename packages

Browse Source 
Rename packages to MariaDB-columnstore-engine, MariaDB-columnstore-libs
and MariaDB-columnstore-platform.

Also add the "columnstore-" prefix the the components so that MariaDB's
packaging system understands then and add a line to include them in
MariaDB's packaging.

In addition
* Fix S3 building for dist source build
* Fix Debian 10 dependency issue
* Fix git handling for dist builds
* Add support for MariaDB's RPM building
* Use MariaDB's PCRE and readline
* Removes a few dead files
* Fix Boost noncopyable includes
This commit is contained in:
Andrew Hutchings
2019-11-27 08:21:58 +00:00
parent a8cd34f86d
commit 7489d0bfd0
87 changed files with 294 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writeengine/bulk/CMakeLists.txt
View File

@ -40,5 +40,5 @@ add_executable(cpimport.bin ${cpimport.bin_SRCS})
add_dependencies(cpimport.bin marias3)
target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml)
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

4
writeengine/client/CMakeLists.txt
View File

@ -10,8 +10,6 @@ add_library(writeengineclient SHARED ${writeengineclient_LIB_SRCS})
target_link_libraries(writeengineclient ${NETSNMP_LIBRARIES})
set_target_properties(writeengineclient PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)

4
writeengine/redistribute/CMakeLists.txt
View File

@ -13,10 +13,8 @@ add_library(writeengineredistribute SHARED ${writeengineredistribute_LIB_SRCS})
target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES})
set_target_properties(writeengineredistribute PROPERTIES VERSION 1.0.0 SOVERSION 1)
target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)

2
writeengine/server/CMakeLists.txt
View File

@ -21,5 +21,5 @@ add_executable(WriteEngineServer ${WriteEngineServer_SRCS})
target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute)
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

2
writeengine/shared/CMakeLists.txt
View File

@ -4,7 +4,7 @@ include_directories(${ENGINE_COMMON_INCLUDES} ../dictionary)
add_executable(we_shared_components_tests ./shared_components_tests.cpp)
target_link_libraries(we_shared_components_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES})
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### install files ###############

2
writeengine/splitter/CMakeLists.txt
View File

@ -19,5 +19,5 @@ add_executable(cpimport ${cpimport_SRCS})
target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} batchloader threadpool)
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

4
writeengine/wrapper/CMakeLists.txt
View File

@ -41,6 +41,4 @@ add_library(writeengine SHARED ${writeengine_LIB_SRCS})
target_link_libraries(writeengine ${NETSNMP_LIBRARIES})
set_target_properties(writeengine PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)