CMake: change most AIRPCAP to AirPcap.

This squelches a warning from CMake.

Fixes issue #1093.

(cherry picked from commit d7c7d92c0830d2bb45d87a46818815b7de639e08)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ad038f841293f17737318a62a8672169623f74..7664bd7f19af81e5edaa135f43bda909311481bd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1812,7 +1812,7 @@ if(NOT DISABLE_SNF)
 endif()
 
 # Check for Riverbed AirPcap support.
 endif()
 
 # Check for Riverbed AirPcap support.

-if(NOT DISABLE_AIRPCAP)
+if(NOT DISABLE_AirPcap)

     #
     # Try to find the AirPcap header file and library.
     #
     #
     # Try to find the AirPcap header file and library.
     #


@@ -1821,14 +1821,14 @@ if(NOT DISABLE_AIRPCAP)
     #
     # Did we succeed?
     #
     #
     # Did we succeed?
     #

-    if(AIRPCAP_FOUND)
+    if(AirPcap_FOUND)

         #
         # Yes.
         #
         #
         # Yes.
         #

-        include_directories(AFTER ${AIRPCAP_INCLUDE_DIRS})
+        include_directories(AFTER ${AirPcap_INCLUDE_DIRS})

         set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-airpcap.c)
         set(HAVE_AIRPCAP_API TRUE)
         set(PROJECT_SOURCE_LIST_C ${PROJECT_SOURCE_LIST_C} pcap-airpcap.c)
         set(HAVE_AIRPCAP_API TRUE)

-        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${AIRPCAP_LIBRARIES})
+        set(PCAP_LINK_LIBRARIES ${PCAP_LINK_LIBRARIES} ${AirPcap_LIBRARIES})

     endif()
 endif()
 
     endif()
 endif()
 

diff --git a/cmake/Modules/FindAirPcap.cmake b/cmake/Modules/FindAirPcap.cmake
index 8198f70f0f131047b202aae32f3f61889492a525..56c71b7bf10dfb605ddaa7268037b67cdffca8d0 100644 (file)
--- a/cmake/Modules/FindAirPcap.cmake
+++ b/cmake/Modules/FindAirPcap.cmake
@@ -6,14 +6,14 @@
 #
 # This module defines the following variables:
 #
 #
 # This module defines the following variables:
 #

-# AIRPCAP_INCLUDE_DIR     - absolute path to the directory containing airpcap.h.
+# AirPcap_INCLUDE_DIR     - absolute path to the directory containing airpcap.h.

 #
 #

-# AIRPCAP_LIBRARY         - relative or absolute path to the AirPcap library to
+# AirPcap_LIBRARY         - relative or absolute path to the AirPcap library to

 #                          link with. An absolute path is will be used if the
 #                          AirPcap library is not located in the compiler's
 #                          default search path.
 
 #                          link with. An absolute path is will be used if the
 #                          AirPcap library is not located in the compiler's
 #                          default search path.
 

-# AIRPCAP_FOUND           - TRUE if the AirPcap library *and* header are found.
+# AirPcap_FOUND           - TRUE if the AirPcap library *and* header are found.

 #
 # Hints and Backward Compatibility
 # ================================
 #
 # Hints and Backward Compatibility
 # ================================


@@ -46,24 +46,24 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 endif()
 
 # Find the header
 endif()
 
 # Find the header

-find_path(AIRPCAP_INCLUDE_DIR airpcap.h
+find_path(AirPcap_INCLUDE_DIR airpcap.h

   PATH_SUFFIXES include
 )
 
 # Find the library
   PATH_SUFFIXES include
 )
 
 # Find the library

-find_library(AIRPCAP_LIBRARY
+find_library(AirPcap_LIBRARY

   NAMES airpcap
 )
 
   NAMES airpcap
 )
 

-# Set AIRPCAP_FOUND to TRUE if AIRPCAP_INCLUDE_DIR and AIRPCAP_LIBRARY are TRUE.
+# Set AirPcap_FOUND to TRUE if AirPcap_INCLUDE_DIR and AirPcap_LIBRARY are TRUE.

 include(FindPackageHandleStandardArgs)
 include(FindPackageHandleStandardArgs)

-find_package_handle_standard_args(AIRPCAP
+find_package_handle_standard_args(AirPcap

   DEFAULT_MSG
   DEFAULT_MSG

-  AIRPCAP_INCLUDE_DIR
-  AIRPCAP_LIBRARY
+  AirPcap_INCLUDE_DIR
+  AirPcap_LIBRARY

 )
 
 )
 

-mark_as_advanced(AIRPCAP_INCLUDE_DIR AIRPCAP_LIBRARY)
+mark_as_advanced(AirPcap_INCLUDE_DIR AirPcap_LIBRARY)

 
 

-set(AIRPCAP_INCLUDE_DIRS ${AIRPCAP_INCLUDE_DIR})
-set(AIRPCAP_LIBRARIES ${AIRPCAP_LIBRARY})
+set(AirPcap_INCLUDE_DIRS ${AirPcap_INCLUDE_DIR})
+set(AirPcap_LIBRARIES ${AirPcap_LIBRARY})