From 87a74912b7d01a95a91e92928811dd8417d14b57 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 19 Oct 2010 15:53:59 -0500 Subject: [PATCH] Minor changes to custom CMake find_package() modules. - Fix typo in FindPCAP - FindBIND is now more explicit when looking for include dir --- cmake/FindBIND.cmake | 15 ++++++++++----- cmake/FindPCAP.cmake | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cmake/FindBIND.cmake b/cmake/FindBIND.cmake index 56297c5546..f81b2d3b91 100644 --- a/cmake/FindBIND.cmake +++ b/cmake/FindBIND.cmake @@ -22,11 +22,11 @@ find_path(BIND_ROOT_DIR NAMES include/resolv.h ) -mark_as_advanced(BIND_ROOT_DIR) -if (BIND_ROOT_DIR) - set(BIND_INCLUDE_DIR ${BIND_ROOT_DIR}/include) -endif () +find_path(BIND_INCLUDE_DIR + NAMES resolv.h + HINTS ${BIND_ROOT_DIR}/include +) find_library(BIND_LIBRARIES NAMES resolv bind @@ -74,4 +74,9 @@ find_package_handle_standard_args(BIND DEFAULT_MSG BIND_INCLUDE_DIR ) -mark_as_advanced(BIND_LIBRARIES BIND_LIBRARY BIND_INCLUDE_DIR) +mark_as_advanced( + BIND_ROOT_DIR + BIND_LIBRARIES + BIND_LIBRARY + BIND_INCLUDE_DIR +) diff --git a/cmake/FindPCAP.cmake b/cmake/FindPCAP.cmake index cb850f2e11..61ce602821 100644 --- a/cmake/FindPCAP.cmake +++ b/cmake/FindPCAP.cmake @@ -23,7 +23,7 @@ find_path(PCAP_ROOT_DIR find_path(PCAP_INCLUDE_DIR NAMES pcap.h - HINTES ${PCAP_ROOT_DIR}/include + HINTS ${PCAP_ROOT_DIR}/include ) find_library(PCAP_LIBRARY