Commit 075dd736 authored by Daniel Black's avatar Daniel Black Committed by Sergei Golubchik

MDEV-33290: Disable ColumnStore based on boost version (postfix)

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.
parent cb41757f
...@@ -13,15 +13,17 @@ endmacro() ...@@ -13,15 +13,17 @@ endmacro()
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
add_subdirectory(columnstore) cmake_policy(SET CMP0093 NEW)
# https://jira.mariadb.org/browse/MCOL-5611 # https://jira.mariadb.org/browse/MCOL-5611
FIND_PACKAGE(Boost 1.80.0 COMPONENTS system filesystem thread regex date_time chrono atomic) FIND_PACKAGE(Boost COMPONENTS system filesystem thread regex date_time chrono atomic)
IF (Boost_FOUND) IF (Boost_VERSION VERSION_GREATER "1.79.0")
MESSAGE_ONCE(CS_NO_BOOST "Boost Libraries >= 1.80.0 not supported!") MESSAGE_ONCE(CS_NO_BOOST "Boost Libraries >= 1.80.0 not supported!")
return() return()
ENDIF() ENDIF()
add_subdirectory(columnstore)
IF(TARGET columnstore) IF(TARGET columnstore)
# Needed to bump the component changes up to the main scope # Needed to bump the component changes up to the main scope
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL) APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment