rgw: Fix LMDB finding and test building

Resolves: rhbz#2036531

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit aa37b8e2746091ede0cfaf50024bcabf36bbad99)

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 111bb1039bfcfbd1ba03d87a23016e1397e3e4f9..57d7abd3e2190083075172c76fd784930f6ba2bc 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -35,20 +35,8 @@ endfunction()
 
 find_package(ICU 52.0 COMPONENTS uc REQUIRED)
 
-find_package(PkgConfig QUIET)
-if(PkgConfig_FOUND)
-  pkg_check_modules(LMDB QUIET lmdb)
-endif()
-
-if(NOT LMDB_FOUND)
-  find_path(LMDB_INCLUDE_DIR NAMES lmdb.h)
-  find_library(LMDB_LIBRARIES NAMES lmdb)
-  if(LMDB_INCLUDE_DIR AND LMDB_LIBRARIES)
-    set(LMDB_FOUND TRUE)
-  else()
-    message(FATAL_ERROR "LMDB not found. Please install liblmdb-dev or lmdb-devel")
-  endif()
-endif()
+find_package(LMDB REQUIRED)
+add_compile_definitions(LMDB_SAFE_NO_CPP_UTILITIES)
 
 set(librgw_common_srcs
   services/svc_finisher.cc
@@ -271,8 +259,6 @@ if(WITH_RADOSGW_DAOS)
 endif()
 if(WITH_RADOSGW_POSIX)
   #add_subdirectory(driver/posix)
-  find_package(LMDB REQUIRED)
-  add_compile_definitions(LMDB_SAFE_NO_CPP_UTILITIES)
   list(APPEND librgw_common_srcs
              driver/posix/rgw_sal_posix.cc
              driver/posix/lmdb-safe.cc

diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index 673025462bccf7acc878070095e5977329c5b166..d0895450fff1f804a71d7913c8abe87ebf3979d7 100644 (file)
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -12,28 +12,6 @@ if(WITH_RADOSGW_KAFKA_ENDPOINT)
   add_library(kafka_stub STATIC ${kafka_stub_src})
 endif()
 
-# Find LMDB if not already found
-if(NOT LMDB_FOUND)
-  find_package(PkgConfig QUIET)
-  if(PkgConfig_FOUND)
-    pkg_check_modules(LMDB QUIET lmdb)
-  endif()
-  
-  if(NOT LMDB_FOUND)
-    find_path(LMDB_INCLUDE_DIR NAMES lmdb.h
-      PATHS /usr/include /usr/local/include)
-    find_library(LMDB_LIBRARIES NAMES lmdb
-      PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64)
-    
-    if(LMDB_INCLUDE_DIR AND LMDB_LIBRARIES)
-      set(LMDB_FOUND TRUE)
-      message(STATUS "Found LMDB: ${LMDB_LIBRARIES}")
-    else()
-      message(FATAL_ERROR "LMDB not found. Please install liblmdb-dev or lmdb-devel")
-    endif()
-  endif()
-endif()
-
 if(WITH_RADOSGW_LUA_PACKAGES)
   list(APPEND rgw_libs Boost::filesystem)
 endif()
@@ -361,10 +339,7 @@ target_link_libraries(unittest_log_backing
 # Adding the usage cache unit test
 if(WITH_TESTS)
 
-  add_executable(unittest_rgw_usage_cache
-  test_rgw_usage_cache.cc
-  ${CMAKE_SOURCE_DIR}/src/rgw/rgw_usage_cache.cc
-  ${CMAKE_SOURCE_DIR}/src/rgw/rgw_usage_perf.cc)
+  add_executable(unittest_rgw_usage_cache test_rgw_usage_cache.cc)
 
   target_include_directories(unittest_rgw_usage_cache PRIVATE
     ${CMAKE_SOURCE_DIR}/src
@@ -373,6 +348,7 @@ if(WITH_TESTS)
   )
 
   target_link_libraries(unittest_rgw_usage_cache
+    rgw_common
     global
     gtest
     gtest_main