Skip to content

Commit 075dd73

Browse files
grooverdanvuvova
authored andcommitted
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.
1 parent cb41757 commit 075dd73

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

storage/columnstore/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ endmacro()
1313

1414
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
1515
CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
16-
add_subdirectory(columnstore)
16+
cmake_policy(SET CMP0093 NEW)
1717

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

25+
add_subdirectory(columnstore)
26+
2527
IF(TARGET columnstore)
2628
# Needed to bump the component changes up to the main scope
2729
APPEND_FOR_CPACK(CPACK_COMPONENTS_ALL)

0 commit comments

Comments
 (0)