]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: only build extra boost libraries only if WITH_SEASTAR 22521/head
authorKefu Chai <kchai@redhat.com>
Tue, 12 Jun 2018 04:35:39 +0000 (12:35 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 12 Jun 2018 04:38:05 +0000 (12:38 +0800)
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>
CMakeLists.txt

index 3692dd30ffc426c1f9e1e6b6ba3cae93d4f11576..9abeeeb61a335c32bdbaf5670b346adaf5269085 100644 (file)
@@ -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