Merge pull request ceph#22430 from tchaikov/wip-find_package-oath

cmake: find liboath using the correct name Reviewed-by: Casey Bodley <[email protected]> Reviewed-by: Erwan Velu <[email protected]>
senax · Jun 8, 2018 · e61c186 · e61c186
2 parents be651ca + ca78ab2
commit e61c186
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -393,7 +393,7 @@ if(WITH_RADOSGW)
     message(WARNING "disabling WITH_RADOSGW_BEAST_FRONTEND, which depends on WITH_BOOST_CONTEXT")
     set(WITH_RADOSGW_BEAST_FRONTEND OFF)
   endif()
-  find_package(liboath REQUIRED)
+  find_package(OATH REQUIRED)
 
 # https://curl.haxx.se/docs/install.html mentions the
 # configure flags for various ssl backends

diff --git a/cmake/modules/FindOATH.cmake b/cmake/modules/FindOATH.cmake
@@ -0,0 +1,32 @@
+# CMake module to search for liboath headers
+#
+# If it's found it sets OATH_FOUND to TRUE
+# and following variables are set:
+# OATH_INCLUDE_DIRS
+# OATH_LIBRARIES
+find_path(OATH_INCLUDE_DIR
+  oath.h
+  PATHS
+  /usr/include
+  /usr/local/include
+  /usr/include/liboath)
+find_library(OATH_LIBRARY NAMES oath liboath PATHS
+  /usr/local/lib
+  /usr/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OATH DEFAULT_MSG OATH_LIBRARY OATH_INCLUDE_DIR)
+
+mark_as_advanced(OATH_LIBRARY OATH_INCLUDE_DIR)
+
+if(OATH_FOUND)
+  set(OATH_INCLUDE_DIRS "${OATH_INCLUDE_DIR}")
+  set(OATH_LIBRARIES "${OATH_LIBRARY}")
+  if(NOT TARGET OATH::OATH)
+    add_library(OATH::OATH UNKNOWN IMPORTED)
+  endif()
+  set_target_properties(OATH::OATH PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${OATH_INCLUDE_DIRS}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${OATH_LIBRARIES}")
+endif()
diff --git a/cmake/modules/Findliboath.cmake b/cmake/modules/Findliboath.cmake
diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
@@ -72,7 +72,7 @@ add_library(cls_lock_client STATIC ${cls_lock_client_srcs})
 # cls_otp
 set(cls_otp_srcs otp/cls_otp.cc)
 add_library(cls_otp SHARED ${cls_otp_srcs})
-target_link_libraries(cls_otp oath)
+target_link_libraries(cls_otp OATH::OATH)
 set_target_properties(cls_otp PROPERTIES
   VERSION "1.0.0"
   SOVERSION "1"

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
@@ -167,7 +167,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie
   ${CURL_LIBRARIES}
   ${EXPAT_LIBRARIES}
   ${OPENLDAP_LIBRARIES} ${CRYPTO_LIBS}
-  oath)
+  OATH::OATH)
 
 if (WITH_RADOSGW_BEAST_FRONTEND)
   target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING)