summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-08-24 21:36:42 +0200
committerDamjan Marion <dmarion@me.com>2018-08-25 09:55:17 +0000
commit2bfdda76d8b1cffcd8e30ca6855f293b1b1953c5 (patch)
treed96a06e0833d4a513296ee5c8bd036f0e7f36118
parent0219b8dfbf25090214573394cf2c9e5e968cfa9a (diff)
cmake: add more headers to the install list
Change-Id: I3a0f48381232fcac1727034aa6d2504a8d1edb04 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/vcl/CMakeLists.txt6
-rw-r--r--src/vlibapi/CMakeLists.txt19
-rw-r--r--src/vlibmemory/CMakeLists.txt11
-rw-r--r--src/vnet/CMakeLists.txt225
-rw-r--r--src/vpp-api/CMakeLists.txt4
-rw-r--r--src/vpp/CMakeLists.txt5
7 files changed, 271 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eefc2ad7203..cdf756e1b82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -196,7 +196,7 @@ endfunction()
##############################################################################
# subdirs
##############################################################################
-foreach (DIR vppinfra svm vlib vlibmemory vnet vpp vpp-api vat vcl plugins)
+foreach (DIR vppinfra svm vlib vlibmemory vlibapi vnet vpp vpp-api vat vcl plugins)
add_subdirectory(${DIR})
endforeach ()
diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
index e25d048d0c5..e592ce54f32 100644
--- a/src/vcl/CMakeLists.txt
+++ b/src/vcl/CMakeLists.txt
@@ -28,8 +28,14 @@ install(TARGETS vppcom DESTINATION lib)
# vcl headers
##############################################################################
vpp_add_header_files(vcl
+ ldp.h
vcl_event.h
+ sock_test.h
+ ldp_glibc_socket.h
+ vcl_test.h
vppcom.h
+ ldp_socket_wrapper.h
+ sock_test_common.h
)
##############################################################################
diff --git a/src/vlibapi/CMakeLists.txt b/src/vlibapi/CMakeLists.txt
new file mode 100644
index 00000000000..27029bff344
--- /dev/null
+++ b/src/vlibapi/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Copyright (c) 2018 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vpp_add_header_files(vlibapi
+ api_helper_macros.h
+ api.h
+ vat_helper_macros.h
+ api_common.h
+)
diff --git a/src/vlibmemory/CMakeLists.txt b/src/vlibmemory/CMakeLists.txt
index a37fc9fe451..55c47670523 100644
--- a/src/vlibmemory/CMakeLists.txt
+++ b/src/vlibmemory/CMakeLists.txt
@@ -29,6 +29,17 @@ target_link_libraries (vlibmemory vppinfra svm vlib)
add_dependencies(vlibmemory vlibmemory_api_headers)
install (TARGETS vlibmemory DESTINATION lib)
+vpp_add_header_files(vlibmemory
+ vl_memory_msg_enum.h
+ memory_shared.h
+ vl_memory_api_h.h
+ socket_client.h
+ memory_api.h
+ api.h
+ memory_client.h
+ socket_api.h
+)
+
add_library (vlibmemoryclient SHARED
memory_shared.c
memory_client.c
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index ec9fc2dcb67..349ef6458bf 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -475,6 +475,231 @@ vpp_add_api_files(vnet_api_headers
bfd/bfd.api
)
+vpp_add_header_files(vnet
+ l3_types.h
+ vxlan-gpe/vxlan_gpe.h
+ vxlan-gpe/vxlan_gpe_packet.h
+ vxlan-gpe/vxlan_gpe_error.def
+ ip/icmp6.h
+ ip/ip_source_and_port_range_check.h
+ ip/ports.def
+ ip/ip6_to_ip4.h
+ ip/ip4_error.h
+ ip/ip6_error.h
+ ip/ip4_packet.h
+ ip/lookup.h
+ ip/ip_neighbor.h
+ ip/ip6_hop_by_hop_packet.h
+ ip/format.h
+ ip/ip4_mtrie.h
+ ip/icmp4.h
+ ip/icmp46_packet.h
+ ip/igmp_packet.h
+ ip/protocols.def
+ ip/ip6_neighbor.h
+ ip/ip4.h
+ ip/ip6_hop_by_hop.h
+ ip/punt.h
+ ip/ip6.h
+ ip/ip6_packet.h
+ ip/punt_error.def
+ ip/ip.h
+ ip/ip_packet.h
+ ip/ip4_to_ip6.h
+ adj/adj_nbr.h
+ adj/adj_glean.h
+ adj/adj_nsh.h
+ adj/adj.h
+ adj/adj_types.h
+ adj/rewrite.h
+ fib/fib_table.h
+ fib/fib_entry.h
+ fib/fib.h
+ fib/ip4_fib.h
+ fib/fib_node.h
+ fib/ip6_fib.h
+ fib/fib_types.h
+ fib/fib_node_list.h
+ fib/fib_entry_delegate.h
+ devices/virtio/virtio.h
+ devices/virtio/vhost_user.h
+ devices/af_packet/af_packet.h
+ devices/devices.h
+ devices/tap/tap.h
+ devices/netmap/netmap.h
+ devices/netlink.h
+ devices/pipe/pipe.h
+ vnet_msg_enum.h
+ dpo/load_balance.h
+ dpo/dpo.h
+ dpo/punt_dpo.h
+ dpo/lookup_dpo.h
+ dpo/drop_dpo.h
+ dpo/classify_dpo.h
+ dpo/receive_dpo.h
+ dpo/ip_null_dpo.h
+ dpo/replicate_dpo.h
+ l2tp/packet.h
+ l2tp/l2tp.h
+ global_funcs.h
+ bier/bier_types.h
+ bier/bier_entry.h
+ bier/bier_table.h
+ bier/bier_update.h
+ ipsec-gre/ipsec_gre.h
+ ipsec-gre/error.def
+ interface_funcs.h
+ lawful-intercept/lawful_intercept.h
+ util/radix.h
+ util/refcount.h
+ cop/cop.h
+ ipsec/ikev2.h
+ ipsec/ikev2_priv.h
+ ipsec/ah.h
+ ipsec/esp.h
+ ipsec/ipsec.h
+ flow/flow.h
+ lisp-gpe/lisp_gpe_packet.h
+ lisp-gpe/lisp_gpe_error.def
+ lisp-gpe/lisp_gpe_fwd_entry.h
+ lisp-gpe/lisp_gpe_tenant.h
+ lisp-gpe/lisp_gpe.h
+ lldp/lldp.h
+ lldp/lldp_protocol.h
+ pipeline.h
+ hdlc/packet.h
+ hdlc/hdlc.h
+ hdlc/error.def
+ vxlan/vxlan_packet.h
+ vxlan/vxlan.h
+ vxlan/vxlan_error.def
+ srmpls/sr_mpls.h
+ pg/edit.h
+ pg/pg.h
+ bonding/node.h
+ dns/dns.h
+ feature/feature.h
+ dhcp/dhcp6_pd_client_dp.h
+ dhcp/client.h
+ dhcp/dhcp4_proxy_error.def
+ dhcp/dhcp4_packet.h
+ dhcp/dhcp6_proxy_error.def
+ dhcp/dhcp6_client_common_dp.h
+ dhcp/dhcp_proxy.h
+ dhcp/dhcp6_ia_na_client_dp.h
+ dhcp/dhcp6_packet.h
+ tls/tls.h
+ sctp/sctp_error.def
+ sctp/sctp_packet.h
+ sctp/sctp_timer.h
+ sctp/sctp.h
+ ipip/ipip.h
+ handoff.h
+ api_errno.h
+ osi/osi.h
+ udp/udp_error.def
+ udp/udp_packet.h
+ udp/udp.h
+ ppp/packet.h
+ ppp/ppp.h
+ ppp/error.def
+ lisp-cp/lisp_types.h
+ lisp-cp/lisp_cp_messages.h
+ lisp-cp/packets.h
+ lisp-cp/gid_dictionary.h
+ lisp-cp/lisp_msg_serdes.h
+ lisp-cp/control.h
+ vnet.h
+ mpls/packet.h
+ mpls/mpls.h
+ mpls/mpls_tunnel.h
+ mpls/mpls_types.h
+ mpls/error.def
+ mfib/mfib_types.h
+ mfib/ip4_mfib.h
+ mfib/mfib_table.h
+ interface.h
+ plugin/plugin.h
+ l2/l2_xcrw.h
+ l2/l2_output.h
+ l2/l2_rw.h
+ l2/l2_fib.h
+ l2/l2_vtr.h
+ l2/feat_bitmap.h
+ l2/l2_flood.h
+ l2/l2_classify.h
+ l2/l2_bd.h
+ l2/l2_efp_filter.h
+ l2/l2_fwd.h
+ l2/l2_input.h
+ l2/l2_input_vtr.h
+ l2/l2_bvi.h
+ geneve/geneve.h
+ geneve/geneve_error.def
+ geneve/geneve_packet.h
+ tcp/tcp_packet.h
+ tcp/tcp_debug.h
+ tcp/tcp_timer.h
+ tcp/tcp_error.def
+ tcp/tcp.h
+ session-apps/echo_client.h
+ session-apps/proxy.h
+ unix/pcap.h
+ unix/tuntap.h
+ unix/tapcli.h
+ srv6/sr.h
+ srv6/sr_packet.h
+ gre/packet.h
+ gre/gre.h
+ gre/error.def
+ span/span.h
+ policer/xlate.h
+ policer/policer.h
+ policer/police.h
+ config.h
+ buffer.h
+ llc/llc.h
+ session/session_lookup.h
+ session/mma_template.c
+ session/application.h
+ session/segment_manager.h
+ session/mma_template.h
+ session/session_rules_table.h
+ session/session.h
+ session/transport.h
+ session/session_debug.h
+ session/mma_16.h
+ session/mma_40.h
+ session/session_table.h
+ session/transport_interface.h
+ session/application_namespace.h
+ session/stream_session.h
+ session/application_interface.h
+ replication.h
+ ethernet/packet.h
+ ethernet/arp.h
+ ethernet/p2p_ethernet.h
+ ethernet/sfp.h
+ ethernet/types.def
+ ethernet/arp_packet.h
+ ethernet/ethernet.h
+ ethernet/error.def
+ ipfix-export/ipfix_info_elements.h
+ ipfix-export/flow_report.h
+ ipfix-export/flow_report_classify.h
+ ipfix-export/ipfix_packet.h
+ snap/snap.h
+ classify/flow_classify.h
+ classify/in_out_acl.h
+ classify/vnet_classify.h
+ classify/policer_classify.h
+ bfd/bfd_udp.h
+ bfd/bfd_protocol.h
+ bfd/bfd_main.h
+ srp/packet.h
+ srp/srp.h
+)
+
add_library(vnet SHARED ${VNET_SRCS})
vpp_library_set_multiarch_sources(vnet
diff --git a/src/vpp-api/CMakeLists.txt b/src/vpp-api/CMakeLists.txt
index b91098aa029..9a719570c7f 100644
--- a/src/vpp-api/CMakeLists.txt
+++ b/src/vpp-api/CMakeLists.txt
@@ -22,3 +22,7 @@ add_library (vppapiclient SHARED
target_link_libraries(vppapiclient vppinfra vlibmemoryclient svm pthread m rt)
add_dependencies(vppapiclient vpp_version_h api_headers)
install(TARGETS vppapiclient DESTINATION lib)
+
+vpp_add_header_files(vpp-api
+ client/vppapiclient.h
+)
diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index b3073deecdb..8799d26f4c8 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -69,6 +69,11 @@ add_dependencies(vpp vpp_version_h api_headers)
set_target_properties(vpp PROPERTIES ENABLE_EXPORTS 1)
install(TARGETS vpp DESTINATION bin)
+vpp_add_header_files(vpp
+ api/vpe_msg_enum.h
+ api/vpe_all_api_h.h
+)
+
##############################################################################
# vppctl binary
##############################################################################