frederic.heem:

  Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt

me: 
  Fix a typo, change gcc flags to mimic the behaviour of autofoo
  stuff.


svn path=/trunk/; revision=19707

3 files changed, 103 insertions, 12 deletions

diff --git a/cmake/modules/CMakeInstallDirs.cmake b/cmake/modules/CMakeInstallDirs.cmake
new file mode 100644
index 0000000000..543c5f376e
--- /dev/null
+++ b/cmake/modules/CMakeInstallDirs.cmake
@@ -0,0 +1,54 @@
+# - CMakeInstallDirs.cmake
+# This script defines some variables that describe paths needed to install an application:
+# CMAKE_INSTALL_BINDIR
+
+# CMAKE_INSTALL_DATADIR
+# CMAKE_INSTALL_SYSCONFDIR
+# CMAKE_INSTALL_LOCALSTATEDIR
+# CMAKE_INSTALL_LIBDIR
+# CMAKE_INSTALL_MANDIR
+
+#Documentation string
+SET(CMAKE_INSTALL_BINDIR_DOC        "user executables [PREFIX/bin]")
+SET(CMAKE_INSTALL_SBINDIR_DOC       "system admin executables [EPREFIX/sbin]")
+SET(CMAKE_INSTALL_DATADIR_DOC       "read-only architecture-independent data [PREFIX/share]")
+SET(CMAKE_INSTALL_SYSCONFDIR_DOC    "read-only single-machine data [PREFIX/etc]")
+SET(CMAKE_INSTALL_LOCALSTATEDIR_DOC "modifiable single-machine data [PREFIX/var]")
+SET(CMAKE_INSTALL_LIBDIR_DOC         "object code libraries [PREFIX/lib]")
+SET(CMAKE_INSTALL_MANDIR_DOC        "man documentation [PREFIX/man]")
+
+#Special case for /etc and /var when prefix is /usr
+IF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+  SET(CMAKE_INSTALL_SYSCONFDIR "/etc" CACHE PATH ${CMAKE_INSTALL_SYSCONFDIR_DOC})
+  SET(CMAKE_INSTALL_LOCALSTATEDIR "/var" CACHE PATH ${CMAKE_INSTALL_LOCALSTATEDIR_DOC})
+ENDIF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+
+#General case
+SET(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin"
+    CACHE PATH ${CMAKE_INSTALL_BINDIR_DOC})
+SET(CMAKE_INSTALL_SBINDIR "${CMAKE_INSTALL_PREFIX}/sbin"
+    CACHE PATH ${CMAKE_INSTALL_SBINDIR_DOC})
+SET(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
+    CACHE PATH ${CMAKE_INSTALL_DATADIR_DOC})
+SET(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc"
+    CACHE PATH ${CMAKE_INSTALL_SYSCONFDIR_DOC})
+SET(CMAKE_INSTALL_LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var"
+    CACHE PATH ${CMAKE_INSTALL_LOCALSTATEDIR_DOC})
+SET(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib"
+    CACHE PATH ${CMAKE_INSTALL_LIBDIR_DOC})
+SET(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/man"
+    CACHE PATH ${CMAKE_INSTALL_MANDIR_DOC})
+
+
+MARK_AS_ADVANCED(
+  CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_SYSCONFDIR
+  CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_MANDIR
+)
+
+
+
+
diff --git a/cmake/modules/Check64BitFormat.cmake b/cmake/modules/Check64BitFormat.cmake
index 4f8c843163..0941591fca 100644
--- a/cmake/modules/Check64BitFormat.cmake
+++ b/cmake/modules/Check64BitFormat.cmake
@@ -14,7 +14,7 @@
 # check_64bit_format(I64 FORMAT_64BIT)
 # 
 # if(NOT FORMAT_64BIT)
-#   message(FATAL " 64 bit formart missing")
+#   message(FATAL " 64 bit format missing")
 # endif(NOT FORMAT_64BIT)
 # 
 # set(PRIX64 "${FORMAT_64BIT}X")
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake
index bd0da85eff..fbbaf62eac 100644
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@@ -1,26 +1,63 @@
 # - Find pcap
 # Find the PCAP includes and library
+# http://www.tcpdump.org/
 #
+# The environment variable PCAPDIR allows to specficy where to find 
+# libpcap in non standard location.
+#  
 #  PCAP_INCLUDE_DIRS - where to find pcap.h, etc.
 #  PCAP_LIBRARIES   - List of libraries when using pcap.
 #  PCAP_FOUND       - True if pcap found.
 
-#Includes
-FIND_PATH(PCAP_INCLUDE_DIR pcap.h
-  /usr/local/include
-  /usr/include
-)
 
-SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})
+IF(EXISTS $ENV{PCAPDIR})
+  FIND_PATH(PCAP_INCLUDE_DIR 
+    NAMES
+    pcap/pcap.h
+    pcap.h
+    PATHS
+      $ENV{PCAPDIR}
+    NO_DEFAULT_PATH
+  )
+  
+  FIND_LIBRARY(PCAP_LIBRARY
+    NAMES 
+      pcap
+    PATHS
+      $ENV{PCAPDIR}
+    NO_DEFAULT_PATH
+  )
+  
 
-#Library
-FIND_LIBRARY(PCAP_LIBRARY
-  NAMES pcap
-  PATHS /usr/lib /usr/local/lib
-)
+ELSE(EXISTS $ENV{PCAPDIR})
+  FIND_PATH(PCAP_INCLUDE_DIR 
+    NAMES
+    pcap/pcap.h
+    pcap.h
+  )
+  
+  FIND_LIBRARY(PCAP_LIBRARY
+    NAMES 
+      pcap
+  )
+  
+ENDIF(EXISTS $ENV{PCAPDIR})
 
+SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})
 SET(PCAP_LIBRARIES ${PCAP_LIBRARY})
 
+IF(PCAP_INCLUDE_DIRS)
+  MESSAGE(STATUS "Pcap include dirs set to ${PCAP_INCLUDE_DIRS}")
+ELSE(PCAP_INCLUDE_DIRS)
+  MESSAGE(FATAL " Pcap include dirs cannot be found")
+ENDIF(PCAP_INCLUDE_DIRS)
+
+IF(PCAP_LIBRARIES)
+  MESSAGE(STATUS "Pcap library set to  ${PCAP_LIBRARIES}")
+ELSE(PCAP_LIBRARIES)
+  MESSAGE(FATAL "Pcap library cannot be found")
+ENDIF(PCAP_LIBRARIES)
+
 #Functions
 INCLUDE(CheckFunctionExists)
 SET(CMAKE_REQUIRED_INCLUDES ${PCAP_INCLUDE_DIRS})