database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-10 01:22:48 +03:00
Code Activity

An attempt to add Andrew's s3 api as a submodule.

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-03-22 17:30:40 -05:00
parent 93a1366a4a
commit b414e1ee5f
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -0,0 +1,3 @@
[submodule "libmarias3"]
path = libmarias3
url = git@github.com:mariadb-corporation/libmarias3.git

28
CMakeLists.txt
View File

@@ -40,13 +40,37 @@ endif()
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
set(S3_CONFIGURE_OPT --enable-debug)
endif() endif()
set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3)
include(ExternalProject)
ExternalProject_Add(marias3
SOURCE_DIR ${S3API_DIR}
CONFIGURE_COMMAND autoreconf ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared=no --prefix=${CMAKE_CURRENT_BINARY_DIR} ${S3_CONFIGURE_OPT}
BUILD_COMMAND make
BUILD_IN_SOURCE 0
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}
)
#add_custom_command(TARGET marias3
# PRE_BUILD
# COMMAND autoreconf -fi
# WORKING_DIRECTORY ${S3API_DIR}
#)
add_executable(StorageManager src/main.cpp ${storagemanager_SRCS}) add_executable(StorageManager src/main.cpp ${storagemanager_SRCS})
target_link_libraries(StorageManager boost_system boost_thread boost_filesystem boost_regex) add_dependencies(StorageManager marias3)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
target_link_libraries(StorageManager boost_system boost_thread boost_filesystem boost_regex libmarias3.a)
add_executable(unit_tests src/unit_tests.cpp ${storagemanager_SRCS}) add_executable(unit_tests src/unit_tests.cpp ${storagemanager_SRCS})
target_link_libraries(unit_tests boost_system boost_thread boost_filesystem boost_regex) add_dependencies(unit_tests marias3)
target_link_libraries(unit_tests boost_system boost_thread boost_filesystem boost_regex libmarias3.a)
#install(TARGETS StorageManager DESTINATION ${ENGINE_BINDIR} COMPONENT platform) #install(TARGETS StorageManager DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

1
libmarias3 Submodule

Submodule libmarias3 added at f37284fc72