cmake: move WITH_RADOSGW checks up to test/CMakeLists.txt

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 63598971bbdb0cee5411925cb1d143b3a2759b18..8f57b2db9b6ca0259b67fa4ccd7ee05af5355285 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -46,11 +46,13 @@ if(NOT WIN32)
     add_subdirectory(cls_journal)
     add_subdirectory(cls_rbd)
   endif(WITH_RBD)
+  if(WITH_RADOSGW)
+    add_subdirectory(cls_rgw)
+    add_subdirectory(cls_rgw_gc)
+  endif(WITH_RADOSGW)
   add_subdirectory(cls_refcount)
-  add_subdirectory(cls_rgw)
   add_subdirectory(cls_version)
   add_subdirectory(cls_lua)
-  add_subdirectory(cls_rgw_gc)
   add_subdirectory(cls_queue)
   add_subdirectory(cls_2pc_queue)
   add_subdirectory(cls_cmpomap)

diff --git a/src/test/cls_rgw/CMakeLists.txt b/src/test/cls_rgw/CMakeLists.txt
index 67b8beb6c4be621faa4dc0c006d370536fb4f2d2..875ca82c1ab0b77a0d584e2719e1fce0847b9513 100644 (file)
--- a/src/test/cls_rgw/CMakeLists.txt
+++ b/src/test/cls_rgw/CMakeLists.txt
@@ -1,24 +1,21 @@
-if(${WITH_RADOSGW})
-  add_executable(ceph_test_cls_rgw
-    test_cls_rgw.cc
-    )
-  target_link_libraries(ceph_test_cls_rgw
-    cls_rgw_client
-    librados
-    global
-    ${UNITTEST_LIBS}
-    ${EXTRALIBS}
-    ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    radostest-cxx)
-  install(TARGETS
-    ceph_test_cls_rgw
-    DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-  add_executable(ceph_test_cls_rgw_stats test_cls_rgw_stats.cc
-         $<TARGET_OBJECTS:unit-main>)
-  target_link_libraries(ceph_test_cls_rgw_stats cls_rgw_client global
-         librados ${UNITTEST_LIBS} radostest-cxx)
-  install(TARGETS ceph_test_cls_rgw_stats DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(${WITH_RADOSGW})
+add_executable(ceph_test_cls_rgw
+  test_cls_rgw.cc
+  )
+target_link_libraries(ceph_test_cls_rgw
+  cls_rgw_client
+  librados
+  global
+  ${UNITTEST_LIBS}
+  ${EXTRALIBS}
+  ${BLKID_LIBRARIES}
+  ${CMAKE_DL_LIBS}
+  radostest-cxx)
+install(TARGETS
+  ceph_test_cls_rgw
+  DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+add_executable(ceph_test_cls_rgw_stats test_cls_rgw_stats.cc
+  $<TARGET_OBJECTS:unit-main>)
+target_link_libraries(ceph_test_cls_rgw_stats cls_rgw_client global
+  librados ${UNITTEST_LIBS} radostest-cxx)
+install(TARGETS ceph_test_cls_rgw_stats DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/src/test/cls_rgw_gc/CMakeLists.txt b/src/test/cls_rgw_gc/CMakeLists.txt
index dd16615253be7eb94f5f411eac73cd6dbf497ba2..9e98fa3b36f8a80b78e7160ef37d119de49fa929 100644 (file)
--- a/src/test/cls_rgw_gc/CMakeLists.txt
+++ b/src/test/cls_rgw_gc/CMakeLists.txt
@@ -1,18 +1,15 @@
-if(${WITH_RADOSGW})
-  add_executable(ceph_test_cls_rgw_gc
-    test_cls_rgw_gc.cc
-    )
-  target_link_libraries(ceph_test_cls_rgw_gc
-    cls_rgw_gc_client
-    librados
-    global
-    ${UNITTEST_LIBS}
-    ${EXTRALIBS}
-    ${BLKID_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    radostest-cxx)
-  install(TARGETS
-    ceph_test_cls_rgw_gc
-    DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(${WITH_RADOSGW})
-
+add_executable(ceph_test_cls_rgw_gc
+  test_cls_rgw_gc.cc
+  )
+target_link_libraries(ceph_test_cls_rgw_gc
+  cls_rgw_gc_client
+  librados
+  global
+  ${UNITTEST_LIBS}
+  ${EXTRALIBS}
+  ${BLKID_LIBRARIES}
+  ${CMAKE_DL_LIBS}
+  radostest-cxx)
+install(TARGETS
+  ceph_test_cls_rgw_gc
+  DESTINATION ${CMAKE_INSTALL_BINDIR})