diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 07:41:43 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-04 07:41:43 +0000 |
| commit | e56915bad92a2ce73e2c4efbd0b4e1cd99890d23 (patch) | |
| tree | 75795bf4633ba2c278ab299c4f6fb1a461c28473 /cmake | |
| parent | 76c769e50b024f568c6051a6d699ed65a71df629 (diff) | |
| download | wireshark-e56915bad92a2ce73e2c4efbd0b4e1cd99890d23.tar.gz | |
Fogot to set the <package>_INCLUDE_DIRS variable, thus it
would only work on platforms where the required path got set for
another package
svn path=/trunk/; revision=52350
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGCRYPT.cmake | 9 | ||||
| -rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake index aa48f16053..8c37e59a0d 100644 --- a/cmake/modules/FindGCRYPT.cmake +++ b/cmake/modules/FindGCRYPT.cmake @@ -17,7 +17,12 @@ ENDIF (GCRYPT_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("gnutls-.*" "GCRYPT_HINTS") -FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h HINTS "${GCRYPT_HINTS}/include") +FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h + HINTS + "${GCRYPT_HINTS}" + PATH_SUFFIXES + include +) SET(GCRYPT_NAMES gcrypt libgcrypt-11) FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} HINTS "${GCRYPT_HINTS}/bin") @@ -30,8 +35,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLU IF(GCRYPT_FOUND) SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} ${GCRYPT_ERROR_LIBRARY}) + SET( GCRYPT_INCLUDE_DIRS ${GCRYPT_INCLUDE_DIR}) ELSE(GCRYPT_FOUND) SET( GCRYPT_LIBRARIES ) + SET( GCRYPT_INCLUDE_DIRS ) ENDIF(GCRYPT_FOUND) MARK_AS_ADVANCED( GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIRS ) diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake index fe5c521f0a..dc7a782a47 100644 --- a/cmake/modules/FindGNUTLS.cmake +++ b/cmake/modules/FindGNUTLS.cmake @@ -21,8 +21,10 @@ FIND_PATH(GNUTLS_INCLUDE_DIR NAMES gnutls.h gnutls/gnutls.h -# PATHS - HINTS "${GNUTLS_HINTS}/include" + PATH_SUFFIXES + include + HINTS + ${GNUTLS_HINTS} ) SET(GNUTLS_NAMES gnutls libgnutls-26) @@ -35,8 +37,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNUTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLU IF(GNUTLS_FOUND) SET( GNUTLS_LIBRARIES ${GNUTLS_LIBRARY} ) + SET( GNUTLS_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR} ) ELSE(GNUTLS_FOUND) SET( GNUTLS_LIBRARIES ) + SET( GNUTLS_INCLUDE_DIR ) ENDIF(GNUTLS_FOUND) MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS ) |