diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2018-10-16 10:00:33 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-10-16 20:43:52 +0000 |
| commit | 3d6bf1fe00a0eff48ddd83af3e3c0c18b65d6afd (patch) | |
| tree | af60c7f75649574cc51422ffd893ed3d481c113a /cmake | |
| parent | 9769df50efd830254aef0310562cdf47edd4ada3 (diff) | |
Revert "cmake: fix version check for c-ares and gnuTLS"
This reverts commit 189a7357e799c0faa5e36d4966f485b9b6d394e3.
Change-Id: I6550703036a135866d7751da489c4974be79bb37
Reviewed-on: https://code.wireshark.org/review/30226
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCARES.cmake | 10 | ||||
| -rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 7 |
2 files changed, 1 insertions, 16 deletions
diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake index 526f70ee9f..2725a61d44 100644 --- a/cmake/modules/FindCARES.cmake +++ b/cmake/modules/FindCARES.cmake @@ -17,16 +17,6 @@ ENDIF (CARES_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("c-ares-.*" "CARES_HINTS") -if (NOT WIN32) - find_package(PkgConfig) - - if( CARES_OPTIONS ) - pkg_search_module( CARES c-ares>=${CARES_OPTIONS} ) - else() - pkg_search_module( CARES c-ares ) - endif() -endif() - FIND_PATH(CARES_INCLUDE_DIR ares.h HINTS "${CARES_HINTS}/include" ) SET(CARES_NAMES cares libcares-2) diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake index b347eada98..0487341285 100644 --- a/cmake/modules/FindGNUTLS.cmake +++ b/cmake/modules/FindGNUTLS.cmake @@ -19,12 +19,7 @@ FindWSWinLibs("gnutls-.*" "GNUTLS_HINTS") if (NOT WIN32) find_package(PkgConfig) - - if( GNUTLS_OPTIONS ) - pkg_search_module( GNUTLS gnutls>=${GNUTLS_OPTIONS} ) - else() - pkg_search_module( GNUTLS gnutls ) - endif() + pkg_search_module(GNUTLS gnutls) endif() # sources include gnutls/gnutls.h, look for that location instead of gnutls.h. |