1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

use system boost, if possible

boost 1.71.0 is what ubuntu focal has, so let's start with that version.
boost 1.77.0 is the first that supports c++20
This commit is contained in:
Sergei Golubchik
2022-11-10 00:22:15 +01:00
committed by david.hall
parent 9b84bf57c9
commit ae88ef1823
2 changed files with 11 additions and 1 deletions

View File

@ -32,7 +32,12 @@ INCLUDE(check_compiler_flag)
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
INCLUDE(CheckCXXSourceCompiles) INCLUDE(CheckCXXSourceCompiles)
MY_CHECK_CXX_COMPILER_FLAG("-std=c++20") FIND_PACKAGE(Boost 1.71.0 COMPONENTS chrono filesystem program_options regex system thread)
IF (NOT Boost_FOUND OR Boost_VERSION VERSION_GREATER 1.76.99)
MY_CHECK_CXX_COMPILER_FLAG("-std=c++20")
ENDIF()
IF (have_CXX__std_c__20) IF (have_CXX__std_c__20)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
ELSE() ELSE()

View File

@ -1,3 +1,8 @@
if (Boost_FOUND)
add_custom_target(external_boost)
return()
endif()
include(ExternalProject) include(ExternalProject)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")