]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: fix boost components for WITH_SYSTEM_BOOST 15160/head
authorBassam Tabbara <bassam.tabbara@quantum.com>
Thu, 18 May 2017 07:32:59 +0000 (00:32 -0700)
committerBassam Tabbara <bassam.tabbara@quantum.com>
Thu, 18 May 2017 17:18:10 +0000 (10:18 -0700)
when using WITH_SYSTEM_BOOST dont set header-only packages
for BOOST_COMPONENTS. On some distros these packages dont
exist.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
CMakeLists.txt

index af4641553fda9d97d0698434bfb1c0a28877c2b9..005c8567ef82eee0e4c540e0ed721365bccc3043 100644 (file)
@@ -512,7 +512,9 @@ endif()
 option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
 
 set(BOOST_COMPONENTS
-       container thread system regex random program_options date_time iostreams coroutine context)
+       thread system regex random program_options date_time iostreams coroutine context)
+set(BOOST_HEADER_COMPONENTS container)
+
 if(WITH_MGR)
        list(APPEND BOOST_COMPONENTS python)
 endif()
@@ -532,6 +534,7 @@ else()
   set(BOOST_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
   set(BOOST_PREFIX "${PROJECT_BINARY_DIR}/boost")
   set(BOOST_BUILD "${PROJECT_BINARY_DIR}/boost-build")
+  list(APPEND BOOST_COMPONENTS ${BOOST_HEADER_COMPONENTS})
   string(REPLACE ";" "," BOOST_WITH_LIBS "${BOOST_COMPONENTS}")
   execute_process(COMMAND "./bootstrap.sh"
     "--prefix=${BOOST_PREFIX}"