From: Bassam Tabbara <bassam.tabbara@quantum.com>
Date: Thu, 18 May 2017 07:32:59 +0000 (-0700)
Subject: cmake: fix boost components for WITH_SYSTEM_BOOST
X-Git-Tag: v12.1.0~10^2~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23b073237e6e321f7deaba65a810b187a84be0a0;p=ceph.git

cmake: fix boost components for WITH_SYSTEM_BOOST

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>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af4641553fda9..005c8567ef82e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}"