]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
CMake: fix rbd build
authorJohn Spray <john.spray@redhat.com>
Mon, 3 Aug 2015 15:11:22 +0000 (16:11 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 3 Aug 2015 15:39:35 +0000 (16:39 +0100)
Don't link with 'global' from rbd (to match
autotools update fa78739).  Fixes "g_ceph_context
defined twice" error.

Signed-off-by: John Spray <john.spray@redhat.com>
src/CMakeLists.txt

index 5a9b17ad7947750615237f1ad074c0c08de6cc7b..c77c19a65adf6e0276b0343204831843963f31e6 100644 (file)
@@ -740,7 +740,7 @@ if(${WITH_RBD})
     $<TARGET_OBJECTS:parse_secret_objs>
     $<TARGET_OBJECTS:heap_profiler_objs>)
   set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
-  target_link_libraries(rbd global librbd librados common keyutils udev
+  target_link_libraries(rbd librbd librados common keyutils udev
     ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS})
   install(TARGETS rbd DESTINATION bin)
   install(PROGRAMS ${CMAKE_SOURCE_DIR}/src/ceph-rbdnamer DESTINATION bin)