[Cmake-commits] [cmake-commits] lowman committed FindGnuTLS.cmake 1.2 1.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30059

Modified Files:
	FindGnuTLS.cmake 
Log Message:
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).


Index: FindGnuTLS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGnuTLS.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** FindGnuTLS.cmake	28 Sep 2009 15:45:33 -0000	1.2
--- FindGnuTLS.cmake	9 Oct 2009 02:50:13 -0000	1.3
***************
*** 41,49 ****
  ENDIF (NOT WIN32)
  
! FIND_PATH(GNUTLS_INCLUDE_DIR gnutls.h
     HINTS
     ${PC_GNUTLS_INCLUDEDIR}
     ${PC_GNUTLS_INCLUDE_DIRS}
-    PATH_SUFFIXES gnutls
     )
  
--- 41,48 ----
  ENDIF (NOT WIN32)
  
! FIND_PATH(GNUTLS_INCLUDE_DIR gnutls/gnutls.h
     HINTS
     ${PC_GNUTLS_INCLUDEDIR}
     ${PC_GNUTLS_INCLUDE_DIRS}
     )
  
***************
*** 54,57 ****
--- 53,58 ----
     )
  
+ 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
***************
*** 59,65 ****
  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})
  
--- 60,66 ----
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
  
! IF(GNUTLS_FOUND)
!     SET(GNUTLS_LIBRARIES    ${GNUTLS_LIBRARY})
!     SET(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR})
! ENDIF()