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

Merge branch columnstore-23.02.1-1 into develop-23.02 (#2778)

Browse Source 
* cmake fixes:

* set build byproducts (otherwise ninja cannot build)
* exclude thrift from "all" target, it should only be buit as a dependency
  (otherwise it builds - and pulls in boost - when columnstore is disabled)
* move test-only external project into tests/ (because it requires git)
  and into storage/columnstore (where thrift and boost already are)

* Update drone to use 10.6-enterprise server branch. (#2763)

---------

Co-authored-by: Sergei Golubchik <serg@mariadb.com>
This commit is contained in:
Gagan Goel
2023-03-17 06:23:22 -04:00
committed by GitHub
parent 7f3d540841
commit fd045e2fdf
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/thrift.cmake
View File

@ -24,6 +24,8 @@ ExternalProject_Add(external_thrift
-DCMAKE_CXX_FLAGS:STRING="-fPIC"
-DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS}
-DBOOST_LIBRARYDIR=${Boost_LIBRARY_DIRS}
BUILD_BYPRODUCTS "${THRIFT_LIBRARY_DIRS}/${CMAKE_STATIC_LIBRARY_PREFIX}thrift${CMAKE_STATIC_LIBRARY_SUFFIX}"
EXCLUDE_FROM_ALL TRUE
)
add_dependencies(external_thrift external_boost)