RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-24 20:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: fix boost build on ubuntu yakkety

Browse Source 
If the host system has boost version 1.61 or higher (as in the case
for ubuntu 16.10 yakkety) the ceph build is currently broken. it
will pickup the system boost libraries but use the headers from the
submodule.

This commit ensure that when WITH_SYSTEM_BOOST is OFF we always
use the boost libraries and headers built from the submodule.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
This commit is contained in:
Bassam Tabbara 2016-11-22 11:53:34 -08:00
parent f0b7d36a92
commit 3eef10b977
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -449,6 +449,9 @@ else()
include_directories(BEFORE ${BOOST_PREFIX}/include)
# fixup for CheckIncludeFileCXX
set(HAVE_BOOST_ASIO_COROUTINE ON)
set(BOOST_ROOT ${BOOST_PREFIX})
set(Boost_NO_SYSTEM_PATHS ON)
endif()
set(Boost_USE_MULTITHREADED ON)
@ -460,7 +463,7 @@ if(WITH_MGR)
endif()
# require minimally the bundled version
find_package(Boost 1.61 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
find_package(Boost 1.61 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${PROJECT_BINARY_DIR}/include)