database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

Proper external_boost for storage manager, cmake version REQUIRES

Browse Source
This commit is contained in:
Leonid Fedorov
2022-08-30 22:41:44 +00:00
parent 7251f58818
commit 726cc3684b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
PROJECT(Columnstore)

2
cmake/cpackEngineDEB.cmake
View File

@@ -1,6 +1,6 @@
IF(DEB)
CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
SET(CMAKE_INSTALL_PREFIX ${INSTALL_ENGINE})

12
storage-manager/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.12)
project(storagemanager)
include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE} ${S3API_DIR})
@@ -59,13 +60,17 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/storagemanager.cnf.in" "${CMAKE_CURR
link_directories(${CMAKE_BINARY_DIR}/lib)
set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib)
add_library(storagemanager SHARED ${storagemanager_SRCS})
add_dependencies(storagemanager marias3)
add_dependencies(storagemanager marias3 external_boost)
target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
target_link_libraries(storagemanager boost_chrono boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS})
add_executable(StorageManager src/main.cpp)
target_link_libraries(StorageManager storagemanager)
set_property(TARGET StorageManager PROPERTY CXX_STANDARD 20)
set(TMPDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -90,9 +95,6 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/test_data
${CMAKE_CURRENT_BINARY_DIR}/test_data
# COMMAND ${CMAKE_COMMAND} -E copy
# ../bin/unit_tests # what is putting our bins in ../bin?
# ${CMAKE_CURRENT_BINARY_DIR}
)
# The includes and lib linkages required to link against cloudio ...

2
utils/threadpool/CMakeLists.txt
View File

@@ -6,6 +6,6 @@ include_directories( ${ENGINE_COMMON_INCLUDES} )
set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool.cpp fair_threadpool.cpp)
add_library(threadpool SHARED ${threadpool_LIB_SRCS})
add_dependencies(threadpool loggingcpp)
add_dependencies(threadpool loggingcpp external_boost)
target_link_libraries(threadpool boost_chrono)
install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)