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

Updated the ref for Andrew's S3 project, fixed a couple things

Browse Source 
in the cmakelists.txt file.
This commit is contained in:
Patrick LeBlanc
2019-03-25 15:30:20 -05:00
parent e27f91e59e
commit bb5a3d6127
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -48,29 +48,22 @@ 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}
CONFIGURE_COMMAND autoreconf -fi ${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}
#)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
add_executable(StorageManager src/main.cpp ${storagemanager_SRCS})
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)
set_property(TARGET StorageManager PROPERTY CXX_STANDARD 11)
add_executable(unit_tests src/unit_tests.cpp ${storagemanager_SRCS})
add_dependencies(unit_tests marias3)
target_link_libraries(unit_tests boost_system boost_thread boost_filesystem boost_regex libmarias3.a)
set_property(TARGET unit_tests PROPERTY CXX_STANDARD 11)
#install(TARGETS StorageManager DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
libmarias3

Submodule libmarias3 updated: f37284fc72...b1e256cbd4