RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: avoid false-positive LDAP header detect

Browse Source 
Pre-setting a value in OPENLDAP_INCLUDE_DIR broke the subsequent
test.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Matt Benjamin 2016-03-14 14:08:53 -04:00
parent 4b27b34324
commit bcddb5672b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/modules/FindOpenLdap.cmake
View File

@ -3,13 +3,13 @@
# OPENLDAP_PREFIX - where to find ldap.h and libraries
# OPENLDAP_FOUND - True if found.
set(OPENLDAP_INCLUDE_DIR "${OPENLDAP_PREFIX}/include")
set(OPENLDAP_LIB_DIR "${OPENLDAP_PREFIX}/lib")
find_path(OPENLDAP_INCLUDE_DIR ldap.h NO_DEFAULT_PATH PATHS
/usr/include
/opt/local/include
/usr/local/include
"${OPENLDAP_PREFIX}/include"
)
find_library(LIBLDAP NAMES ldap)
@ -23,12 +23,13 @@ endif (OPENLDAP_INCLUDE_DIR AND LIBLDAP AND LIBLBER)
if (OPENLDAP_FOUND)
message(STATUS "Found ldap: ${OPENLDAP_INCLUDE_DIR}")
else ()
message(STATUS "Failed to find ldap.h")
if (OPENLDAP_FIND_REQUIRED)
message(FATAL_ERROR "Missing required ldap.h")
endif ()
endif ()
else (OPENLDAP_FOUND)
if (NOT OPENLDAP_INCLUDE_DIR)
message(FATAL_ERROR "Missing required ldap.h (openldap-devel)")
else (NOT OPENLDAP_INCLUDE_DIR)
message (FATAL_ERROR "Missing required LDAP libraries (openldap)")
endif (NOT OPENLDAP_INCLUDE_DIR)
endif (OPENLDAP_FOUND)
set(OPENLDAP_LIBS ${LIBLDAP} ${LIBLBER})