summaryrefslogtreecommitdiffstats
path: root/cicn-plugin/cmake/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'cicn-plugin/cmake/Modules')
-rw-r--r--cicn-plugin/cmake/Modules/FindVpp.cmake4
-rw-r--r--cicn-plugin/cmake/Modules/FindVppDpdk.cmake37
2 files changed, 2 insertions, 39 deletions
diff --git a/cicn-plugin/cmake/Modules/FindVpp.cmake b/cicn-plugin/cmake/Modules/FindVpp.cmake
index a930a946..33fe95e5 100644
--- a/cicn-plugin/cmake/Modules/FindVpp.cmake
+++ b/cicn-plugin/cmake/Modules/FindVpp.cmake
@@ -26,7 +26,7 @@ set(VPP_SEARCH_PATH_LIST
/opt
/usr)
-find_path(VPP_INCLUDE_DIR vpp-api/vpe.api.h
+find_path(VPP_INCLUDE_DIR vpp/api/vpe.api.h
HINTS ${VPP_SEARCH_PATH_LIST}
PATH_SUFFIXES include
DOC "Find the VPP includes")
@@ -34,7 +34,7 @@ find_path(VPP_INCLUDE_DIR vpp-api/vpe.api.h
set(VPP_INCLUDE_DIRS
${VPP_INCLUDE_DIR}
${VPP_INCLUDE_DIR}/vpp-api
- ${VPP_INCLUDE_DIR}/pneum
+ ${VPP_INCLUDE_DIR}/vpp-api/pneum
${VPP_INCLUDE_DIR}/vlibmemory
${VPP_INCLUDE_DIR}/vat
${VPP_INCLUDE_DIR}/vlibapi
diff --git a/cicn-plugin/cmake/Modules/FindVppDpdk.cmake b/cicn-plugin/cmake/Modules/FindVppDpdk.cmake
deleted file mode 100644
index 5c6bd62a..00000000
--- a/cicn-plugin/cmake/Modules/FindVppDpdk.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2017 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.
-
-########################################
-#
-# Find the VPP libraries and includes
-# This module sets:
-# VPP_DPDK_FOUND: True if VPP was found
-# VPP_DPDK_INCLUDE_DIR: The VPP include dir
-#
-
-set(VPP_DPDK_SEARCH_PATH_LIST
- ${VPP_DPDK_ROOT}
- $ENV{VPP_DODK_ROOT}
- /usr/local
- /opt
- /usr)
-
-find_path(VPP_DPDK_INCLUDE_DIR vpp-dpdk/rte_version.h
- HINTS ${VPP_DPDK_SEARCH_PATH_LIST}
- PATH_SUFFIXES include
- DOC "Find the VPP-DPDK includes")
-
-set(VPP_DPDK_INCLUDE_DIRS ${VPP_DPDK_INCLUDE_DIR} ${VPP_DPDK_INCLUDE_DIR}/vpp-dpdk)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(VppDpdk DEFAULT_MSG VPP_DPDK_INCLUDE_DIR)