Skip to content

Commit

Permalink
MDEV-33290: Disable ColumnStore based on boost version (postfix)
Browse files Browse the repository at this point in the history
Its important to fail early and only contine with the include after
the boost version check succeeds.

Needs to succeed on ealier verisons too so can't just fail if too new.
As such, do a version check.
  • Loading branch information
grooverdan authored and vuvova committed Apr 5, 2024
1 parent cb41757 commit 075dd73
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions storage/columnstore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ endmacro()

IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
add_subdirectory(columnstore)
cmake_policy(SET CMP0093 NEW)

# https://jira.mariadb.org/browse/MCOL-5611
FIND_PACKAGE(Boost 1.80.0 COMPONENTS system filesystem thread regex date_time chrono atomic)
IF (Boost_FOUND)
FIND_PACKAGE(Boost COMPONENTS system filesystem thread regex date_time chrono atomic)
IF (Boost_VERSION VERSION_GREATER "1.79.0")
MESSAGE_ONCE(CS_NO_BOOST "Boost Libraries >= 1.80.0 not supported!")
return()
ENDIF()

add_subdirectory(columnstore)

IF(TARGET columnstore)
# Needed to bump the component changes up to the main scope
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
Expand Down

0 comments on commit 075dd73

Please sign in to comment.