From: Kefu Chai <kchai@redhat.com>
Date: Wed, 20 Jul 2016 06:13:40 +0000 (+0800)
Subject: cmake: use FindBacktrace instead of Findexecinfo
X-Git-Tag: ses5-milestone5~345^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=636522b66930d0ceff0c384271f9b4f8f74c0c82;p=ceph.git

cmake: use FindBacktrace instead of Findexecinfo

always better to use upstream cmake modules.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95e41fd6e735..f149069efc18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ else(ENABLE_SHARED)
 endif(ENABLE_SHARED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ${ENABLE_SHARED})
 
-find_package(execinfo)
+find_package(Backtrace)
 
 find_package(udev REQUIRED)
 set(HAVE_UDEV ${UDEV_FOUND})
diff --git a/cmake/modules/Findexecinfo.cmake b/cmake/modules/Findexecinfo.cmake
deleted file mode 100644
index c6bf7c8448ed..000000000000
--- a/cmake/modules/Findexecinfo.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# - Find execinfo
-# Find the execinfo headers and libraries.
-#
-#  EXECINFO_INCLUDE_DIRS - where to find execinfo.h, etc.
-#  EXECINFO_LIBRARIES    - List of libraries when using execinfo.
-#  EXECINFO_FOUND        - True if execinfo found.
-
-# Look for the header file.
-FIND_PATH(EXECINFO_INCLUDE_DIR NAMES execinfo.h)
-
-# Look for the library.
-FIND_LIBRARY(EXECINFO_LIBRARY NAMES execinfo)
-
-# handle the QUIETLY and REQUIRED arguments and set EXECINFO_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(execinfo DEFAULT_MSG EXECINFO_LIBRARY EXECINFO_INCLUDE_DIR)
-
-# Copy the results to the output variables.
-IF(EXECINFO_FOUND)
-  SET(EXECINFO_LIBRARIES ${EXECINFO_LIBRARY})
-  SET(EXECINFO_INCLUDE_DIRS ${EXECINFO_INCLUDE_DIR})
-ELSE(EXECINFO_FOUND)
-  SET(EXECINFO_LIBRARIES)
-  SET(EXECINFO_INCLUDE_DIRS)
-ENDIF(EXECINFO_FOUND)
-
-MARK_AS_ADVANCED(EXECINFO_INCLUDE_DIR EXECINFO_LIBRARY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b08b3b2f87ee..24f2a2446f64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -511,7 +511,7 @@ endif(${HAVE_ARMV8_CRC})
 
 add_library(common_utf8 STATIC common/utf8.c)
 
-target_link_libraries(common json_spirit common_utf8 erasure_code rt uuid resolv ${CRYPTO_LIBS} ${Boost_LIBRARIES} ${BLKID_LIBRARIES} ${EXECINFO_LIBRARIES})
+target_link_libraries(common json_spirit common_utf8 erasure_code rt uuid resolv ${CRYPTO_LIBS} ${Boost_LIBRARIES} ${BLKID_LIBRARIES} ${Backtrace_LIBRARIES})
 
 if(${WITH_LTTNG})
   add_subdirectory(tracing)