From d5dd8f126df3cfc3fae76ed9be75be9679ece32c Mon Sep 17 00:00:00 2001 From: Philip Lowman Date: Thu, 8 Oct 2009 22:50:13 -0400 Subject: Resolve #9685: Fix include dir to be correct path Also refrain from setting _LIBRARIES & _INCLUDE_DIRS if lib not found (seems to be mostly standard practice). --- Modules/FindGnuTLS.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Modules/FindGnuTLS.cmake') diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake index a70823fb8a..72ab511624 100644 --- a/Modules/FindGnuTLS.cmake +++ b/Modules/FindGnuTLS.cmake @@ -40,11 +40,10 @@ IF (NOT WIN32) SET(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) ENDIF (NOT WIN32) -FIND_PATH(GNUTLS_INCLUDE_DIR gnutls.h +FIND_PATH(GNUTLS_INCLUDE_DIR gnutls/gnutls.h HINTS ${PC_GNUTLS_INCLUDEDIR} ${PC_GNUTLS_INCLUDE_DIRS} - PATH_SUFFIXES gnutls ) FIND_LIBRARY(GNUTLS_LIBRARY NAMES gnutls libgnutls @@ -53,13 +52,15 @@ FIND_LIBRARY(GNUTLS_LIBRARY NAMES gnutls libgnutls ${PC_GNUTLS_LIBRARY_DIRS} ) +MARK_AS_ADVANCED(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) + # handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR) -MARK_AS_ADVANCED(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) - -SET(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) -SET(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) +IF(GNUTLS_FOUND) + SET(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) + SET(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) +ENDIF() -- cgit v1.2.1