CMake: build dencoder at src/ceph-dencoder

...instead of in src/test/dencoder.

While the source lives in test/, the dencoder tool is built
and distributed as a first class binary, so it's awkward for
paths in dev/test to have it in a unique location.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 327a300012e57ed8546f120b4f03e6e7a6bd080f..e3a9b0e87bb5488ef67404d64dd3aa92e60e4989 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -467,6 +467,58 @@ install(TARGETS rados librados-config DESTINATION bin)
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/
   DESTINATION ${PYTHON_INSTDIR})
 
+## dencoder
+set(dencoder_srcs
+  test/encoding/ceph_dencoder.cc
+  krbd.cc
+  common/secret.c
+  common/TextTable.cc
+  )
+if(${WITH_RADOSGW})
+  list(APPEND dencoder_srcs
+    rgw/rgw_dencoder.cc
+    rgw/rgw_acl.cc
+    rgw/rgw_common.cc
+    rgw/rgw_env.cc
+    rgw/rgw_json_enc.cc
+  )
+endif(${WITH_RADOSGW})
+add_executable(ceph-dencoder ${dencoder_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+if(${WITH_RADOSGW})
+  set(DENCODER_EXTRALIBS
+    rgw_a
+    cls_rgw_client
+    curl
+    expat
+    fcgi
+    resolv
+  )
+endif(${WITH_RADOSGW})
+target_link_libraries(ceph-dencoder
+  librados
+  librbd
+  global
+  osd
+  mds
+  mon
+  osdc
+  cls_lock_client
+  cls_refcount_client
+  cls_log_client
+  cls_statelog_client
+  cls_version_client
+  cls_replica_log_client
+  cls_kvs
+  cls_user_client
+  ${DENCODER_EXTRALIBS}
+  blkid
+  udev
+  keyutils
+  ${EXTRALIBS}
+  ${TCMALLOC_LIBS}
+  ${CMAKE_DL_LIBS}
+  )
+
 # Monitor
 set(lib_mon_srcs
   auth/cephx/CephxKeyServer.cc

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index de35fa98e54b9d3fe19c0166fc5aea198a6c3228..e5a035e12952cfe345acbf513a4f4142735229fe 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -92,58 +92,6 @@ add_executable(test_keys
   )
 target_link_libraries(test_keys mon global ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS})
 
-## dencoder
-set(dencoder_srcs
-  encoding/ceph_dencoder.cc
-  ${CMAKE_SOURCE_DIR}/src/krbd.cc
-  ${CMAKE_SOURCE_DIR}/src/common/secret.c
-  ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc
-  )
-if(${WITH_RADOSGW})
-  list(APPEND dencoder_srcs
-    ${CMAKE_SOURCE_DIR}/src/rgw/rgw_dencoder.cc
-    ${CMAKE_SOURCE_DIR}/src/rgw/rgw_acl.cc
-    ${CMAKE_SOURCE_DIR}/src/rgw/rgw_common.cc
-    ${CMAKE_SOURCE_DIR}/src/rgw/rgw_env.cc
-    ${CMAKE_SOURCE_DIR}/src/rgw/rgw_json_enc.cc
-  )
-endif(${WITH_RADOSGW})
-add_executable(dencoder ${dencoder_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
-if(${WITH_RADOSGW})
-  set(DENCODER_EXTRALIBS
-    rgw_a
-    cls_rgw_client
-    curl
-    expat
-    fcgi
-    resolv
-  )
-endif(${WITH_RADOSGW})
-target_link_libraries(dencoder
-  librados
-  librbd
-  global
-  osd
-  mds
-  mon
-  osdc
-  cls_lock_client
-  cls_refcount_client
-  cls_log_client
-  cls_statelog_client
-  cls_version_client
-  cls_replica_log_client
-  cls_kvs
-  cls_user_client
-  ${DENCODER_EXTRALIBS}
-  blkid
-  udev
-  keyutils
-  ${EXTRALIBS}
-  ${TCMALLOC_LIBS}
-  ${CMAKE_DL_LIBS}
-  )
-
 # get_command_descriptions
 add_executable(get_command_descriptions
   common/get_command_descriptions.cc