From: Kefu Chai <kchai@redhat.com>
Date: Fri, 22 Jul 2016 05:06:59 +0000 (+0800)
Subject: cmake: cleanup Findblkid.cmake
X-Git-Tag: ses5-milestone5~300^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=342d8279d4d1daeffe76f2fa566a47b62ad01d10;p=ceph.git

cmake: cleanup Findblkid.cmake

* remove unused bits
* fix the wrong mark_as_advanced() call.

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

diff --git a/cmake/modules/Findblkid.cmake b/cmake/modules/Findblkid.cmake
index 08ef0fcd9256..66de92f63f98 100644
--- a/cmake/modules/Findblkid.cmake
+++ b/cmake/modules/Findblkid.cmake
@@ -25,33 +25,9 @@
 
 find_path(BLKID_INCLUDE_DIR blkid/blkid.h)
 
-set(BLKID_NAMES ${BLKID_NAMES} blkid)
-find_library(BLKID_LIBRARY NAMES ${BLKID_NAMES})
+find_library(BLKID_LIBRARIES blkid)
 
-if (BLKID_INCLUDE_DIR AND BLKID_LIBRARY)
-  set(BLKID_FOUND TRUE)
-  set( BLKID_LIBRARIES ${BLKID_LIBRARY} )
-else ()
-  set(BLKID_FOUND FALSE)
-  set( BLKID_LIBRARIES )
-endif ()
-
-if (BLKID_FOUND)
-  message(STATUS "Found libblkid: ${BLKID_LIBRARY}")
-else ()
-  message(STATUS "Not Found libblkid: ${BLKID_LIBRARY}")
-  if (BLKID_FIND_REQUIRED)
-    message(STATUS "Looked for libblkid named ${BLKID_NAMES}.")
-    message(FATAL_ERROR "Could NOT find libblkid")
-  endif ()
-endif ()
-
-# handle the QUIETLY and REQUIRED arguments and set UUID_FOUND to TRUE if
-# all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(blkid DEFAULT_MSG BLKID_LIBRARIES BLKID_INCLUDE_DIR)
 
-mark_as_advanced(
-  BLKID_LIBRARY
-  BLKID_I
-)
+mark_as_advanced(BLKID_LIBRARIES BLKID_INCLUDE_DIR)