From: Kefu Chai <kchai@redhat.com>
Date: Thu, 11 Aug 2016 06:48:56 +0000 (+0800)
Subject: cmake: cleanup Findxio.cmake
X-Git-Tag: ses5-milestone5~140^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d9debd57dd151213724e4433a6fff027526358d;p=ceph.git

cmake: cleanup Findxio.cmake

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

diff --git a/cmake/modules/Findxio.cmake b/cmake/modules/Findxio.cmake
index 44cb008acee..938af03efb8 100644
--- a/cmake/modules/Findxio.cmake
+++ b/cmake/modules/Findxio.cmake
@@ -5,33 +5,18 @@
 # XIO_LIBRARIES - List of libraries
 # XIO_FOUND - True if libxio found.
 
-set(_xio_include_path ${HT_DEPENDENCY_INCLUDE_DIR})
-set(_xio_lib_path ${HT_DEPENDENCY_LIB_DIR})
-if (EXISTS ${WITH_XIO})
-  list(APPEND _xio_include_path "${WITH_XIO}/include")
-  list(APPEND _xio_lib_path "${WITH_XIO}/lib")
+if(WITH_XIO AND EXISTS ${WITH_XIO})
+  find_path(XIO_INCLUDE_DIR libxio.h HINTS "${WITH_XIO}/include")
+  find_library(XIO_LIBRARY xio HINTS "${WITH_XIO}/lib")
 else()
-  list(APPEND _xio_include_path /usr/include /usr/local/include /opt/accelio/include)
-  list(APPEND _xio_lib_path /lib /usr/lib /usr/local/lib /opt/accelio/lib)
+  find_path(XIO_INCLUDE_DIR libxio.h)
+  find_library(XIO_LIBRARY xio)
 endif()
 
-find_path(XIO_INCLUDE_DIR libxio.h NO_DEFAULT_PATH PATHS ${_xio_include_path})
-
-find_library(XIO_LIBRARY NO_DEFAULT_PATH NAMES xio PATHS ${_xio_lib_path})
 set(XIO_LIBRARIES ${XIO_LIBRARY})
 
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(xio DEFAULT_MSG XIO_LIBRARY XIO_INCLUDE_DIR)
-
-if (XIO_FOUND)
-  message(STATUS "Found Xio: ${XIO_INCLUDE_DIR} ${XIO_LIBRARY}")
-else ()
-  message(STATUS "Not Found Xio: ${XIO_INCLUDE_DIR} ${XIO_LIBRARY}")
-  if (XIO_FIND_REQUIRED)
-    message(STATUS "Looked for Xio libraries named ${XIO_NAMES}.")
-    message(FATAL_ERROR "Could NOT find Xio library")
-  endif ()
-endif ()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(xio DEFAULT_MSG XIO_LIBRARY XIO_INCLUDE_DIR)
 
 mark_as_advanced(
   XIO_LIBRARY