From: Matt Benjamin <matt@cohortfs.com>
Date: Tue, 10 Mar 2015 18:10:54 +0000 (-0400)
Subject: Fix CMake build w/o RADOSGW.
X-Git-Tag: v9.0.0~184^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76d4d4c6b7e6be84c10a9be91f2c931efc5885f4;p=ceph.git

Fix CMake build w/o RADOSGW.

Just fixes linkage of dencoder in test.  Fix the false assumption
that cls is only used if WITH_RADOSGW.

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
---

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 448d6de155be..396a54faec18 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -106,6 +106,16 @@ if(${WITH_RADOSGW})
   )
 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
@@ -114,6 +124,15 @@ target_link_libraries(dencoder
   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
@@ -121,27 +140,6 @@ target_link_libraries(dencoder
   ${TCMALLOC_LIBS}
   ${CMAKE_DL_LIBS}
   )
-if(${WITH_RADOSGW})
-  target_link_libraries(dencoder
-    ${EXTRALIBS}
-    ${TCMALLOC_LIBS}
-    ${CMAKE_DL_LIBS}
-    rgw_a
-    cls_rgw_client
-    cls_lock_client
-    cls_refcount_client
-    cls_log_client
-    cls_statelog_client
-    cls_version_client
-    cls_replica_log_client
-    cls_kvs
-    cls_user_client
-    curl
-    expat
-    fcgi
-    resolv
-  )
-endif(${WITH_RADOSGW})
 
 # get_command_descriptions
 add_executable(get_command_descriptions