You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
Serg`s patch for develop-6 revised for develop https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2614
This commit is contained in:
@ -21,8 +21,8 @@ add_executable(end_to_end_test end_to_end_test.cpp)
|
||||
# untangle all of that and declare lib dependencies properly.
|
||||
# For now I'm going to do like the other executables, which means
|
||||
# nearly everything AFAICT.
|
||||
target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS} cloudio)
|
||||
target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${MARIADB_CLIENT_LIBS} cloudio)
|
||||
target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
|
||||
target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
|
||||
#target_link_libraries(cloudio_component_test cloudio)
|
||||
# Copy end_to_end_test dataFile to binary directory
|
||||
FILE(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
|
||||
|
@ -1,3 +1,7 @@
|
||||
include_directories(BEFORE
|
||||
${CMAKE_BINARY_DIR}/libmariadb/include
|
||||
${CMAKE_SOURCE_DIR}/libmariadb/include)
|
||||
add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
|
||||
|
||||
include_directories( ${ENGINE_COMMON_INCLUDES} )
|
||||
|
||||
@ -6,6 +10,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES} )
|
||||
set(libmysql_client_LIB_SRCS libmysql_client.cpp)
|
||||
|
||||
add_library(libmysql_client SHARED ${libmysql_client_LIB_SRCS})
|
||||
target_link_libraries(libmysql_client ${MARIADB_CLIENT_LIBS})
|
||||
|
||||
add_dependencies(libmysql_client loggingcpp)
|
||||
|
||||
|
@ -1,3 +1,7 @@
|
||||
include_directories(BEFORE
|
||||
${CMAKE_BINARY_DIR}/libmariadb/include
|
||||
${CMAKE_SOURCE_DIR}/libmariadb/include)
|
||||
add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
|
||||
|
||||
include_directories( ${ENGINE_COMMON_INCLUDES} )
|
||||
|
||||
|
Reference in New Issue
Block a user