You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
Serg dev (#2502)
* build boost during build phase, not during configure
* add dependency for generated header files errorids.h messageids.h
see 7e868bc588
* set explicit dependencies on external_boost for #include's
* clang-14 compatibility fix
This commit is contained in:
@ -12,6 +12,7 @@ set(compress_LIB_SRCS
|
||||
add_definitions(-DNDEBUG)
|
||||
|
||||
add_library(compress SHARED ${compress_LIB_SRCS})
|
||||
add_dependencies(compress loggingcpp external_boost)
|
||||
|
||||
target_link_libraries(compress ${SNAPPY_LIBRARIES})
|
||||
IF(HAVE_LZ4)
|
||||
|
@ -29,6 +29,7 @@ add_library(loggingcpp SHARED
|
||||
${CMAKE_CURRENT_BINARY_DIR}/messageids.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/errorids.h
|
||||
)
|
||||
add_dependencies(loggingcpp external_boost)
|
||||
|
||||
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
|
||||
|
||||
|
@ -13,6 +13,7 @@ set(querytele_LIB_SRCS
|
||||
queryteleprotoimpl.cpp)
|
||||
|
||||
add_library(querytele SHARED ${querytele_LIB_SRCS})
|
||||
add_dependencies(querytele external_boost)
|
||||
|
||||
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
|
||||
|
||||
|
@ -8,6 +8,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES} )
|
||||
set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp)
|
||||
|
||||
add_library(rwlock SHARED ${rwlock_LIB_SRCS})
|
||||
add_dependencies(rwlock external_boost)
|
||||
|
||||
install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
|
||||
|
||||
|
@ -4,6 +4,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES} )
|
||||
ADD_DEFINITIONS(-fPIC -DPIC)
|
||||
|
||||
add_library(idbboot STATIC installdir.cpp)
|
||||
add_dependencies(idbboot external_boost)
|
||||
|
||||
INSTALL(TARGETS idbboot DESTINATION ${ENGINE_LIBDIR})
|
||||
|
||||
|
@ -15,6 +15,7 @@ set(thrift_LIB_SRCS
|
||||
add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT)
|
||||
|
||||
add_library(thrift SHARED ${thrift_LIB_SRCS})
|
||||
add_dependencies(thrift external_boost)
|
||||
|
||||
install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
|
||||
|
||||
|
Reference in New Issue
Block a user