]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake add mds and librbd missing files
authorOrit Wasserman <owasserm@redhat.com>
Thu, 7 May 2015 09:11:12 +0000 (11:11 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Fri, 8 May 2015 08:59:42 +0000 (10:59 +0200)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/CMakeLists.txt

index 2fae8fa5ba530a35281977dcaade6d89c41021b8..973deab0c1f23bc14afee0c5af7864bb04edbd28 100644 (file)
@@ -15,7 +15,6 @@ add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT
 set(CMAKE_ASM_COMPILER  ${PROJECT_SOURCE_DIR}/src/yasm-wrapper)
 message(status " ams compiler ${CMAKE_ASM_COMPILER}")
 set(CMAKE_ASM_FLAGS "-f elf64")
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -Werror=format-security -fno-strict-aliasing -fsigned-char -fPIC")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -ftemplate-depth-1024 -Wno-invalid-offsetof -Wnon-virtual-dtor -Wno-invalid-offsetof -Wstrict-null-sentinel -Woverloaded-virtual")
@@ -292,7 +291,7 @@ if(${WITH_PROFILER})
   target_link_libraries(common profiler)
 endif(${WITH_PROFILER})
 
-target_link_libraries(common json_spirit erasure_code rt uuid ${CRYPTO_LIBS} ${Boost_LIBRARIES})
+target_link_libraries( common json_spirit erasure_code rt uuid ${CRYPTO_LIBS} ${Boost_LIBRARIES})
 
 set(libglobal_srcs
   global/global_init.cc
@@ -517,6 +516,8 @@ if(${WITH_MDS})
     mds/MDSAuthCaps.cc
     mds/MDLog.cc
     mds/JournalPointer.cc
+    mds/StrayManager.cc
+    mds/SimpleLock.cc
     ${CMAKE_SOURCE_DIR}/src/osdc/Journaler.cc)
   add_library(mds ${mds_srcs})
   set(ceph_mds_srcs
@@ -670,7 +671,8 @@ if(${WITH_RBD})
     librbd/internal.cc
     librbd/librbd.cc
     librbd/LibrbdWriteback.cc
-    librbd/ObjectMap.cc)
+    librbd/ObjectMap.cc
+    librbd/RebuildObjectMapRequest.cc)
   add_library(librbd ${CEPH_SHARED} ${librbd_srcs}
     $<TARGET_OBJECTS:osdc_rbd_objs>
     $<TARGET_OBJECTS:common_util_obj>)