From: Kefu Chai <kchai@redhat.com>
Date: Tue, 12 Jun 2018 04:35:39 +0000 (+0800)
Subject: cmake: only build extra boost libraries only if WITH_SEASTAR
X-Git-Tag: v14.0.1~1096^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54216f3c25e6d0806fb4590ca092395271502ebd;p=ceph.git

cmake: only build extra boost libraries only if WITH_SEASTAR

unit_test_framework is an alias of test, and Boost::test is only
necessary if seastar's tests are built. but SEASTAR_ENABLE_TESTS is
reset by us, so drop tests/unit_test_framework here.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3692dd30ffc4..9abeeeb61a33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -589,8 +589,8 @@ option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
 
 # Boost::thread depends on Boost::atomic, so list it explicitly.
 set(BOOST_COMPONENTS
-  atomic chrono filesystem thread system regex random program_options date_time
-  iostreams unit_test_framework)
+  atomic chrono thread system regex random program_options date_time
+  iostreams)
 set(BOOST_HEADER_COMPONENTS container)
 
 if(WITH_MGR)
@@ -599,7 +599,9 @@ endif()
 if(WITH_BOOST_CONTEXT)
   list(APPEND BOOST_COMPONENTS context coroutine)
 endif()
-list(APPEND BOOST_COMPONENTS test timer)
+if(WITH_SEASTAR)
+  list(APPEND BOOST_COMPONENTS filesystem timer)
+endif()
 
 set(Boost_USE_MULTITHREADED ON)
 # require minimally the bundled version