cmake: cleanup FindOpenLdap.cmake

* use find_package_handle_standard_args() and remove unused bits.
* rename OPENLDAP_LIBS to OPENLDAP_LIBRARIES, to be consistent with
  find_package() modules.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba7ce0817938557af2ae6c11fb8f4f7a7d39a44e..2c87ffc177d48f713401678e1f01ca74d3800e73 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,6 @@ option(WITH_OPENLDAP "OPENLDAP is here" ON)
 if(${WITH_OPENLDAP})
 find_package(OpenLdap REQUIRED)
 set(HAVE_OPENLDAP ${OPENLDAP_FOUND})
-message(STATUS "${OPENLDAP_LIBS}")
 endif(${WITH_OPENLDAP})
 
 option(WITH_FUSE "Fuse is here" ON)

diff --git a/cmake/modules/FindOpenLdap.cmake b/cmake/modules/FindOpenLdap.cmake
index 42b3edd01d612d8fa124467c0045f0a147bd608d..35b711d6b331523839763702044e241577ff619b 100644 (file)
--- a/cmake/modules/FindOpenLdap.cmake
+++ b/cmake/modules/FindOpenLdap.cmake
@@ -1,38 +1,22 @@
 # - Find OpenLDAP C Libraries
 #
-# OPENLDAP_PREFIX - where to find ldap.h and libraries
 # OPENLDAP_FOUND - True if found.
+# OPENLDAP_INCLUDE_DIR - Path to the openldap include directory
+# OPENLDAP_LIBRARIES - Paths to the ldap and lber libraries
 
-set(OPENLDAP_LIB_DIR "${OPENLDAP_PREFIX}/lib")
-
-find_path(OPENLDAP_INCLUDE_DIR ldap.h NO_DEFAULT_PATH PATHS
+find_path(OPENLDAP_INCLUDE_DIR ldap.h PATHS
   /usr/include
   /opt/local/include
-  /usr/local/include
-  "${OPENLDAP_PREFIX}/include"
-  )
-
-find_library(LIBLDAP NAMES ldap)
-find_library(LIBLBER NAMES lber)
+  /usr/local/include)
 
-if (OPENLDAP_INCLUDE_DIR AND LIBLDAP AND LIBLBER)
-  set(OPENLDAP_FOUND TRUE)
-else (OPENLDAP_INCLUDE_DIR AND LIBLDAP AND LIBLBER)
-  set(OPENLDAP_FOUND FALSE)
-endif (OPENLDAP_INCLUDE_DIR AND LIBLDAP AND LIBLBER)
+find_library(LDAP_LIBRARY ldap)
+find_library(LBER_LIBRARY lber)
 
-if (OPENLDAP_FOUND)
-  message(STATUS "Found ldap: ${OPENLDAP_INCLUDE_DIR}")
-else (OPENLDAP_FOUND)
-  if (NOT OPENLDAP_INCLUDE_DIR)
-    message(FATAL_ERROR "Missing required ldap.h (openldap-devel)")
-  else (NOT OPENLDAP_INCLUDE_DIR)
-    message (FATAL_ERROR "Missing required LDAP libraries (openldap)")
-  endif (NOT OPENLDAP_INCLUDE_DIR)
-endif (OPENLDAP_FOUND)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenLdap DEFAULT_MSG
+  OPENLDAP_INCLUDE_DIR LDAP_LIBRARY LBER_LIBRARY)
 
-set(OPENLDAP_LIBS ${LIBLDAP} ${LIBLBER})
+set(OPENLDAP_LIBRARIES ${LDAP_LIBRARY} ${LBER_LIBRARY})
 
 mark_as_advanced(
-  OPENLDAP_INCLUDE_DIR OPENLDAP_LIB_DIR OPENLDAP_LIBRARIES
-)
+  OPENLDAP_INCLUDE_DIR LDAP_LIBRARY LBER_LIBRARY)

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 6c449233dc5ad0f6d4ea8700946688d2ba24d2b5..8b6eb6815ce9a9279d5a6d3ea6a34062a0d14bf9 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -91,7 +91,7 @@ add_library(rgw_a STATIC ${rgw_a_srcs})
 target_include_directories(rgw_a PUBLIC ${FCGI_INCLUDE_DIR})
 target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client
   cls_log_client cls_statelog_client cls_timeindex_client cls_version_client
-  cls_replica_log_client cls_user_client curl global expat ${OPENLDAP_LIBS}
+  cls_replica_log_client cls_user_client curl global expat ${OPENLDAP_LIBRARIES}
   ${CRYPTO_LIBS})
 
 set(radosgw_srcs

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 9c1163b684552d86d5e8b618f7fd796b2b1f10ea..5bbe0cc917698ea9f2a88747bbaab65681ce6326 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -338,7 +338,7 @@ set_target_properties(test_rgw_ldap PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(test_rgw_ldap
   librados
-  ${OPENLDAP_LIBS}
+  ${OPENLDAP_LIBRARIES}
   ${Boost_LIBRARIES}
   ${UNITTEST_LIBS}
   )