Skip to content

Commit

Permalink
Revert "cmake: add libboost_system to EXTRALIBS"
Browse files Browse the repository at this point in the history
This reverts commit 21438a6.

Signed-off-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Feb 6, 2016
1 parent 99b9d01 commit 514e7d6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Expand Up @@ -76,8 +76,7 @@ else()
endif()


set(EXTRALIBS uuid rt dl
${Boost_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${ATOMIC_OPS_LIBRARIES})
set(EXTRALIBS uuid rt dl ${Boost_LIBS} ${ATOMIC_OPS_LIBRARIES})

if(${WITH_PROFILER})
list(APPEND EXTRALIBS profiler)
Expand Down
26 changes: 12 additions & 14 deletions src/test/CMakeLists.txt
Expand Up @@ -1990,7 +1990,7 @@ add_executable(test_rados_api_io
set_target_properties(test_rados_api_io PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_io
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_c_write_operations
librados/c_write_operations.cc
Expand All @@ -1999,7 +1999,7 @@ add_executable(test_rados_api_c_write_operations
set_target_properties(test_rados_api_c_write_operations PROPERTIES
COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_c_write_operations
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_c_read_operations
librados/c_read_operations.cc
Expand All @@ -2008,7 +2008,7 @@ add_executable(test_rados_api_c_read_operations
set_target_properties(test_rados_api_c_read_operations PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_c_read_operations
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_aio
librados/aio.cc
Expand All @@ -2017,9 +2017,7 @@ add_executable(test_rados_api_aio
set_target_properties(test_rados_api_aio PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_aio
librados ${UNITTEST_LIBS}
${EXTRALIBS}
${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_list
librados/list.cc
Expand All @@ -2028,7 +2026,7 @@ add_executable(test_rados_api_list
set_target_properties(test_rados_api_list PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_list
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_nlist
librados/nlist.cc
Expand All @@ -2037,7 +2035,7 @@ add_executable(test_rados_api_nlist
set_target_properties(test_rados_api_nlist PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_nlist
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_pool
librados/pool.cc
Expand All @@ -2047,7 +2045,7 @@ set_target_properties(test_rados_api_pool PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS}
)
target_link_libraries(test_rados_api_pool
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_stat
librados/stat.cc
Expand All @@ -2056,7 +2054,7 @@ add_executable(test_rados_api_stat
set_target_properties(test_rados_api_stat PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_stat
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_watch_notify
librados/watch_notify.cc
Expand All @@ -2065,7 +2063,7 @@ add_executable(test_rados_api_watch_notify
set_target_properties(test_rados_api_watch_notify PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_watch_notify
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_cls
librados/cls.cc
Expand All @@ -2074,7 +2072,7 @@ add_executable(test_rados_api_cls
set_target_properties(test_rados_api_cls PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_cls
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_misc
librados/misc.cc
Expand All @@ -2092,7 +2090,7 @@ add_executable(test_rados_api_lock
set_target_properties(test_rados_api_lock PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_lock
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_executable(test_rados_api_tier
librados/tier.cc
Expand All @@ -2110,7 +2108,7 @@ add_executable(test_rados_api_snapshots
set_target_properties(test_rados_api_snapshots PROPERTIES COMPILE_FLAGS
${UNITTEST_CXX_FLAGS})
target_link_libraries(test_rados_api_snapshots
librados ${UNITTEST_LIBS} ${EXTRALIBS} ${ALLOC_LIBS} radostest)
librados ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)

add_library(rados_striper_test STATIC libradosstriper/TestCase.cc)
target_link_libraries(rados_striper_test radostest)
Expand Down

0 comments on commit 514e7d6

Please sign in to comment.