From: Josh <jrosenba@cisco.com>
Date: Mon, 21 Apr 2014 17:45:25 +0000 (-0400)
Subject: Merging with cmake branch.  Adding correct include install path
X-Git-Tag: 3.0.0-233~1559^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6175d7fbc0eb8df9d3bdc3565245788025fff65;p=thirdparty%2Fsnort3.git

Merging with cmake branch.  Adding correct include install path
---

f6175d7fbc0eb8df9d3bdc3565245788025fff65
diff --cc src/protocols/CMakeLists.txt
index 9e32c6167,f99ed4f05..93ba18637
--- a/src/protocols/CMakeLists.txt
+++ b/src/protocols/CMakeLists.txt
@@@ -1,22 -1,23 +1,30 @@@
  
 -set (PROTOCOL_HEADERS
 +add_library (protocols
 +    ipv4.h
 +    tcp.h
      packet.h
-     packet.cc
 -    sf_protocols.h
 +    ipv6.h
 +    udp.h
 +    eth.h
 +    icmp4.h
 +    icmp6.h
 +    gre.h
 +    gtp.h
 +    arp.h
 +    wlan.h
 +    teredo.h
 +    mpls.h
 +    ethertypes.h
 +    protocol_numbers.h
 +    undefined_protocols.h
  )
  
+ add_library (protocols STATIC
 -    checksum.h
 -    decode.cc 
 -    decode.h 
 -    encode.cc 
 -    encode.h 
 -    decode_module.cc
 -    decode_module.h
 -    sf_protocols.h
++    packet.cc
+     ${PROTOCOL_HEADERS}
+ )
+ 
+ install (FILES ${PROTOCOL_HEADERS}
+     DESTINATION "${INCLUDE_INSTALL_PATH}/protocols"
+ )
+ 
 -