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

cmake: cleanup Findbabeltrace.cmake

* we don't need the BABELTRACE_PATH_HINT setting, as packaging script
  requires the the babeltrace pacakges explicitly.

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

diff --git a/cmake/modules/Findbabeltrace.cmake b/cmake/modules/Findbabeltrace.cmake
index d576186b53e2..76f6210578a0 100644
--- a/cmake/modules/Findbabeltrace.cmake
+++ b/cmake/modules/Findbabeltrace.cmake
@@ -1,61 +1,22 @@
 # - Find Babeltrace
-# This module accepts the following optional variables:
-#    BABELTRACE_PATH_HINT   = A hint on BABELTRACE install path.
-#
 # This module defines the following variables:
 #    BABELTRACE_FOUND       = Was Babeltrace found or not?
 #    BABELTRACE_EXECUTABLE  = The path to lttng command
 #    BABELTRACE_LIBRARIES   = The list of libraries to link to when using Babeltrace
 #    BABELTRACE_INCLUDE_DIR = The path to Babeltrace include directory
 #
-# On can set BABELTRACE_PATH_HINT before using find_package(Babeltrace) and the
-# module with use the PATH as a hint to find Babeltrace.
-#
-# The hint can be given on the command line too:
-#   cmake -DBABELTRACE_PATH_HINT=/DATA/ERIC/Babeltrace /path/to/source
-
-if(BABELTRACE_PATH_HINT)
-  message(STATUS "FindBabeltrace: using PATH HINT: ${BABELTRACE_PATH_HINT}")
-else()
-  set(BABELTRACE_PATH_HINT)
-endif()
-
-#One can add his/her own builtin PATH.
-#FILE(TO_CMAKE_PATH "/DATA/ERIC/Babeltrace" MYPATH)
-#list(APPEND BABELTRACE_PATH_HINT ${MYPATH})
 
 find_path(BABELTRACE_INCLUDE_DIR
-          NAMES babeltrace/babeltrace.h babeltrace/ctf/events.h babeltrace/ctf/iterator.h
-          PATHS ${BABELTRACE_PATH_HINT}
-          PATH_SUFFIXES include
-          DOC "The Babeltrace include headers")
-
-find_path(BABELTRACE_LIBRARY_DIR
-          NAMES libbabeltrace.so
-          NAMES libbabeltrace-ctf.so
-          PATHS ${BABELTRACE_PATH_HINT}
-          PATH_SUFFIXES lib lib64
-          DOC "The Babeltrace libraries")
-
-find_library(BABELTRACE NAMES babeltrace babeltrace-ctf PATHS ${BABELTRACE_LIBRARY_DIR})
+  NAMES babeltrace/babeltrace.h babeltrace/ctf/events.h babeltrace/ctf/iterator.h)
 
-set(BABELTRACE_LIBRARIES ${BABELTRACE})
+find_library(BABELTRACE_LIBRARY
+  NAMES babeltrace babeltrace-ctf)
 
-message(STATUS "Looking for Babeltrace...")
-set(BABELTRACE_NAMES "babeltrace;babeltrace-ctf")
-# FIND_PROGRAM twice using NO_DEFAULT_PATH on first shot
 find_program(BABELTRACE_EXECUTABLE
-  NAMES ${BABELTRACE_NAMES}
-  PATHS ${BABELTRACE_PATH_HINT}/bin /bin
-  NO_DEFAULT_PATH
-  DOC "The BABELTRACE command line tool")
+  NAMES babeltrace babeltrace-ctf)
 
-# handle the QUIETLY and REQUIRED arguments and set PRELUDE_FOUND to TRUE if
-# all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(BABELTRACE
-                                  REQUIRED_VARS BABELTRACE_INCLUDE_DIR BABELTRACE_LIBRARY_DIR)
-# VERSION FPHSA options not handled by CMake version < 2.8.2)
-#                                  VERSION_VAR)
-mark_as_advanced(BABELTRACE_INCLUDE_DIR)
-mark_as_advanced(BABELTRACE_LIBRARY_DIR)
+find_package_handle_standard_args(BABELTRACE DEFAULT_MSG
+  BABELTRACE_INCLUDE_DIR BABELTRACE_LIBRARY)
+set(BABELTRACE_LIBRARIES ${BABELTRACE_LIBRARY})
+mark_as_advanced(BABELTRACE_INCLUDE_DIR BABELTRACE_LIBRARY)