From: Kefu Chai Date: Thu, 21 Jul 2016 16:54:17 +0000 (+0800) Subject: cmake: do not check libuuid anymore X-Git-Tag: ses5-milestone5~300^2~13 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3170f16e864e257416bccdd73777bff775767a8f;p=ceph.git cmake: do not check libuuid anymore libuuid dependency is not found in ceph.spec.in or debian/control. and we are not using libuuid since 62bfc7a. Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b6b1e52523..ba7ce081793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,8 +292,6 @@ if(NOT FREEBSD) find_package(keyutils REQUIRED) endif(NOT FREEBSD) -find_package(libuuid REQUIRED) - find_package(CURL REQUIRED) set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS}) set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBRARIES}) diff --git a/cmake/modules/Findlibuuid.cmake b/cmake/modules/Findlibuuid.cmake deleted file mode 100644 index a2d1fbc57fa..00000000000 --- a/cmake/modules/Findlibuuid.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Try to find libuuid -# Once done, this will define -# -# UUID_FOUND - system has Profiler -# UUID_INCLUDE_DIR - the Profiler include directories -# UUID_LIBRARIES - link these to use Profiler - -if(UUID_INCLUDE_DIR AND UUID_LIBRARIES) - set(UUID_FIND_QUIETLY TRUE) -endif(UUID_INCLUDE_DIR AND UUID_LIBRARIES) - -INCLUDE(CheckCXXSymbolExists) - -# include dir - -find_path(UUID_INCLUDE_DIR uuid.h NO_DEFAULT_PATH PATHS - /usr/include - /usr/include/uuid - /opt/local/include - /usr/local/include -) - - -# finally the library itself -find_library(LIBUUID NAMES uuid) -set(UUID_LIBRARIES ${LIBUUID}) - -# 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(libuuid DEFAULT_MSG UUID_LIBRARIES UUID_INCLUDE_DIR) - -mark_as_advanced(UUID_LIBRARIES UUID_INCLUDE_DIR)