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

Fix build order so ms3 is checked out

Browse Source
This commit is contained in:
Andrew Hutchings
2019-09-24 16:47:00 +01:00
parent 8633859dd4
commit fe8228e50a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage-manager/CMakeLists.txt
View File

@@ -56,6 +56,7 @@ link_directories(${CMAKE_BINARY_DIR}/lib)
set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib) set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib)
add_library(storagemanager SHARED ${storagemanager_SRCS}) add_library(storagemanager SHARED ${storagemanager_SRCS})
add_dependencies(storagemanager ms3)
target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
target_link_libraries(storagemanager boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS} ${JEMALLOC_LIBRARIES}) target_link_libraries(storagemanager boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS} ${JEMALLOC_LIBRARIES})
set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11) set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11)

2
writeengine/bulk/CMakeLists.txt
View File

@@ -37,7 +37,7 @@ REMOVE_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
set(cpimport.bin_SRCS cpimport.cpp) set(cpimport.bin_SRCS cpimport.cpp)
add_executable(cpimport.bin ${cpimport.bin_SRCS}) add_executable(cpimport.bin ${cpimport.bin_SRCS})
add_dependencies(cpimport.bin ms3)
target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml) 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 platform)