]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21983 from chardan/jfw-wip-libradosstriper_ultimate-final-battle
authorKefu Chai <tchaikov@gmail.com>
Thu, 23 Aug 2018 11:20:16 +0000 (19:20 +0800)
committerGitHub <noreply@github.com>
Thu, 23 Aug 2018 11:20:16 +0000 (19:20 +0800)
libradosstriper: conditional compile

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
ceph.spec.in
src/test/CMakeLists.txt
src/test/libradosstriper/CMakeLists.txt

diff --cc ceph.spec.in
Simple merge
Simple merge
index 79dd6c537140c92d44ab067a4847e65829219b93,be76b3d285457e4eae4fa519001f739a19801a6e..9403810329ad923ff8f8786abd90e948a56fc0b1
@@@ -1,7 -1,10 +1,10 @@@
+ #
+ # Note: only compiled if WITH_LIBRADOSSTRIPER is defined.
+ #
  add_library(rados_striper_test STATIC TestCase.cc)
 -target_link_libraries(rados_striper_test radostest)
 -set_target_properties(rados_striper_test PROPERTIES COMPILE_FLAGS
 -  ${UNITTEST_CXX_FLAGS})
 +target_link_libraries(rados_striper_test
 +  radostest
 +  GTest::GTest)
  
  add_executable(ceph_test_rados_striper_api_striping
    striping.cc