From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 26 Oct 2016 21:36:22 +0000 (-0400)
Subject: Adapt for ceph-manager
X-Git-Tag: v11.1.0~375^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=132469c4e9525f7d25fda26a6a5b6b856984275a;p=ceph.git

Adapt for ceph-manager

The ceph manager change added a separate Boost dependency
check, add it to the combined section.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20fa46aa196c..5d6323d94b0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ option(WITH_MGR "ceph-mgr is enabled" ON)
 if(WITH_MGR)
     set(Python_ADDITIONAL_VERSIONS 2.7)
     find_package(PythonLibs 2.7 REQUIRED)
-    find_package(Boost COMPONENTS python REQUIRED)
+    # Boost dependency check deferred to Boost section
 endif(WITH_MGR)
 
 option(WITH_THREAD_SAFE_RES_QUERY "res_query is thread safe" OFF)
@@ -420,7 +420,7 @@ else()
   set(Boost_USE_STATIC_LIBS ON)
   execute_process(COMMAND "./bootstrap.sh"
     "--prefix=${BOOST_PREFIX}"
-    "--with-libraries=atomic,container,context,coroutine,coroutine2,date_time,filesystem,iostreams,program_options,random,regex,system,thread"
+    "--with-libraries=atomic,container,context,coroutine,coroutine2,date_time,filesystem,iostreams,program_options,python,random,regex,system,thread"
     WORKING_DIRECTORY ${BOOST_SOURCE_DIR})
   # 2. install headers
   set(BOOST_ROOT "${BOOST_PREFIX}")
@@ -448,10 +448,18 @@ else()
   # 4. set hints for FindBoost.cmake
   set(Boost_NO_SYSTEM_PATHS ON)
   include_directories(BEFORE ${BOOST_PREFIX}/include)
+  # fixup for CheckIncludeFileCXX
+  set(HAVE_BOOST_ASIO_COROUTINE ON)
 endif()
 
 set(Boost_USE_MULTITHREADED ON)
 
+set(BOOST_COMPONENTS
+	thread system regex random program_options date_time iostreams)
+if(WITH_MGR)
+	list(APPEND BOOST_COMPONENTS python)
+endif()
+
 # require minimally the bundled version
 find_package(Boost 1.61 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})