From: Pascal Bach Date: Sun, 1 Jan 2017 22:38:59 +0000 (+0100) Subject: cmake: search for Keyutils in default paths and cleanup X-Git-Tag: v12.0.0~287^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c79bf93d026b9813a791831d2eb10532d80e87f3;p=ceph-ci.git cmake: search for Keyutils in default paths and cleanup This makes it more portable Remove /usr/include as it is searched by find_path anyway. Remove unnecessary include that weren't used. Signed-off-by: Pascal Bach --- diff --git a/cmake/modules/Findkeyutils.cmake b/cmake/modules/Findkeyutils.cmake index 15a07d60bf6..e34be8b5eb4 100644 --- a/cmake/modules/Findkeyutils.cmake +++ b/cmake/modules/Findkeyutils.cmake @@ -9,17 +9,12 @@ if(KEYUTILS_INCLUDE_DIR AND KEYUTILS_LIBRARIES) set(KEYUTILS_FIND_QUIETLY TRUE) endif(KEYUTILS_INCLUDE_DIR AND KEYUTILS_LIBRARIES) -INCLUDE(CheckCXXSymbolExists) - # include dir - -find_path(KEYUTILS_INCLUDE_DIR keyutils.h NO_DEFAULT_PATH PATHS - /usr/include +find_path(KEYUTILS_INCLUDE_DIR keyutils.h PATHS /opt/local/include /usr/local/include ) - # finally the library itself find_library(LIBKEYUTILS NAMES keyutils) set(KEYUTILS_LIBRARIES ${LIBKEYUTILS})