Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
af_xdp: update af_xdp driver plugin to depend on libxdp
[vpp.git]
/
src
/
plugins
/
af_xdp
/
CMakeLists.txt
diff --git
a/src/plugins/af_xdp/CMakeLists.txt
b/src/plugins/af_xdp/CMakeLists.txt
index
cbe96aa
..
1097358
100644
(file)
--- a/
src/plugins/af_xdp/CMakeLists.txt
+++ b/
src/plugins/af_xdp/CMakeLists.txt
@@
-11,36
+11,37
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-vpp_find_path(
BPF_INCLUDE_DIR NAMES bpf
/xsk.h)
-if (NOT
BPF
_INCLUDE_DIR)
- message(WARNING "lib
bpf
headers not found - af_xdp plugin disabled")
+vpp_find_path(
XDP_INCLUDE_DIR NAMES xdp
/xsk.h)
+if (NOT
XDP
_INCLUDE_DIR)
+ message(WARNING "lib
xdp
headers not found - af_xdp plugin disabled")
return()
endif()
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
return()
endif()
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
+vpp_plugin_find_library(af_xdp XDP_LIB libxdp.a)
vpp_plugin_find_library(af_xdp BPF_LIB libbpf.a)
vpp_plugin_find_library(af_xdp BPF_LIB libbpf.a)
-vpp_plugin_find_library(af_xdp
BPF_
ELF_LIB elf)
-vpp_plugin_find_library(af_xdp
BPF_
Z_LIB z)
-if (NOT
BPF_LIB OR NOT BPF_ELF_LIB OR NOT BPF_
Z_LIB)
+vpp_plugin_find_library(af_xdp ELF_LIB elf)
+vpp_plugin_find_library(af_xdp Z_LIB z)
+if (NOT
XDP_LIB OR NOT BPF_LIB OR NOT ELF_LIB OR NOT
Z_LIB)
message(WARNING "af_xdp plugin - missing libraries - af_xdp plugin disabled")
return()
endif()
set(CMAKE_REQUIRED_FLAGS "-fPIC")
message(WARNING "af_xdp plugin - missing libraries - af_xdp plugin disabled")
return()
endif()
set(CMAKE_REQUIRED_FLAGS "-fPIC")
-set(CMAKE_REQUIRED_INCLUDES "${
BPF
_INCLUDE_DIR}")
-set(CMAKE_REQUIRED_LIBRARIES "${
BPF_LIB}" "${BPF_ELF_LIB}" "${BPF_
Z_LIB}")
+set(CMAKE_REQUIRED_INCLUDES "${
XDP
_INCLUDE_DIR}")
+set(CMAKE_REQUIRED_LIBRARIES "${
XDP_LIB}" "${BPF_LIB}" "${ELF_LIB}" "${
Z_LIB}")
CHECK_C_SOURCE_COMPILES("
CHECK_C_SOURCE_COMPILES("
-#include <
bpf
/xsk.h>
+#include <
xdp
/xsk.h>
int main(void)
{
return xsk_socket__create (0, 0, 0, 0, 0, 0, 0);
int main(void)
{
return xsk_socket__create (0, 0, 0, 0, 0, 0, 0);
-}"
BPF
_COMPILES_CHECK)
-if (NOT
BPF
_COMPILES_CHECK)
-
message(WARNING "af_xdp plugins - no working libbpf
found - af_xdp plugin disabled")
+}"
XDP
_COMPILES_CHECK)
+if (NOT
XDP
_COMPILES_CHECK)
+
message(WARNING "af_xdp plugins - no working libxdp
found - af_xdp plugin disabled")
return()
endif()
return()
endif()
-include_directories(${
BPF
_INCLUDE_DIR})
+include_directories(${
XDP
_INCLUDE_DIR})
add_vpp_plugin(af_xdp
SOURCES
add_vpp_plugin(af_xdp
SOURCES
@@
-65,7
+66,8
@@
add_vpp_plugin(af_xdp
test_api.c
LINK_LIBRARIES
test_api.c
LINK_LIBRARIES
+ ${XDP_LIB}
${BPF_LIB}
${BPF_LIB}
- ${
BPF_
ELF_LIB}
- ${
BPF_
Z_LIB}
+ ${ELF_LIB}
+ ${Z_LIB}
)
)