Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Append SDE pkgconfig folders to PKG_CONFIG_PATH #319

Merged
merged 6 commits into from
Oct 24, 2023
Merged

Append SDE pkgconfig folders to PKG_CONFIG_PATH #319

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb67df4
Append SDE pkgconfig folders to PKG_CONFIG_PATH
ffoulkes Oct 20, 2023
b136898
Fix DPDK package issues
ffoulkes Oct 21, 2023
b198e54
Update krnlmon submodule reference
ffoulkes Oct 21, 2023
a4a0d4d
Update krnlmon submodule reference
ffoulkes Oct 21, 2023
8f5b1e2
Update krnlmon submodule reference
ffoulkes Oct 21, 2023
7ada9e6
Update krnlmon submodule reference
ffoulkes Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions cmake/FindDpdkDriver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
# This module requires that SDE_INSTALL_DIR be defined.
# It needs additional work to make it a proper CMake find-module.

#-----------------------------------------------------------------------
# Use pkg-config to find DPDK module
#-----------------------------------------------------------------------
include(FindPkgConfig)
pkg_check_modules(DPDK REQUIRED libdpdk)

#-----------------------------------------------------------------------
# Define SDE_INCLUDE_DIR
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -121,12 +115,40 @@ set_target_properties(sde::target_utils PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${SDE_INCLUDE_DIR}
IMPORTED_LINK_INTERFACE_LANGUAGES C)

#-----------------------------------------------------------------------
# Append SDE pkgconfig directories to PKG_CONFIG_PATH
#-----------------------------------------------------------------------
function(_set_pkg_config_path)
file(TO_CMAKE_PATH "$ENV{PKG_CONFIG_PATH}" _sde_pkg_path)

foreach(_libdir lib lib64 lib/x86_64-linux-gnu)
set(_path ${SDE_INSTALL_DIR}/${_libdir}/pkgconfig)
if(EXISTS ${_path})
list(APPEND _sde_pkg_path ${_path})
endif()
endforeach()

list(JOIN _sde_pkg_path ":" _sde_pkg_path)

if(NOT _sde_pkg_path STREQUAL "")
set(ENV{PKG_CONFIG_PATH} "${_sde_pkg_path}")
endif()
endfunction()

_set_pkg_config_path()

#-----------------------------------------------------------------------
# Use pkg-config to find DPDK module
#-----------------------------------------------------------------------
include(FindPkgConfig)
pkg_check_modules(DpdkDriver REQUIRED libdpdk)

#-----------------------------------------------------------------------
# Define SDE_LIBRARY_DIRS
#-----------------------------------------------------------------------
set(SDE_LIBRARY_DIRS
${SDE_INSTALL_DIR}/lib
${DPDK_LIBRARY_DIRS}
${DpdkDriver_LIBRARY_DIRS}
)

#-----------------------------------------------------------------------
Expand All @@ -145,7 +167,7 @@ function(add_dpdk_target_libraries TGT)
target_link_directories(${TGT} PUBLIC ${SDE_LIBRARY_DIRS})

target_link_options(${TGT} PUBLIC
${DPDK_LD_FLAGS}
${DPDK_LDFLAGS_OTHER}
${DpdkDriver_LDFLAGS}
${DpdkDriver_LDFLAGS_OTHER}
)
endfunction()
2 changes: 1 addition & 1 deletion krnlmon/krnlmon
Open in desktop
Submodule krnlmon updated 33 files
+19 −0 cmake/standalone.cmake
+1 −0 switchapi/CMakeLists.txt
+3 −0 switchapi/es2k/CMakeLists.txt
+4 −0 switchapi/es2k/switch_device.c
+5 −1 switchapi/es2k/switch_fdb.c
+490 −0 switchapi/es2k/switch_lag.c
+18 −8 switchapi/es2k/switch_neighbor.c
+152 −5 switchapi/es2k/switch_pd_fdb.c
+448 −0 switchapi/es2k/switch_pd_lag.c
+42 −0 switchapi/es2k/switch_pd_lag.h
+57 −0 switchapi/es2k/switch_pd_p4_name_mapping.h
+142 −13 switchapi/es2k/switch_pd_routing.c
+1 −1 switchapi/es2k/switch_pd_utils.c
+131 −0 switchapi/switch_lag.h
+2 −1 switchapi/switch_nhop_int.h
+4 −0 switchlink/sai/CMakeLists.txt
+383 −0 switchlink/sai/switchlink_handle_lag.c
+2 −0 switchlink/sai/switchlink_init_sai.c
+7 −0 switchlink/sai/switchlink_init_sai.h
+2 −0 switchlink/switchlink.h
+5 −1 switchlink/switchlink_address.c
+216 −0 switchlink/switchlink_db.c
+40 −0 switchlink/switchlink_db.h
+13 −0 switchlink/switchlink_db_int.h
+6 −0 switchlink/switchlink_handle.h
+136 −1 switchlink/switchlink_link.c
+12 −0 switchlink/switchlink_link.h
+5 −0 switchlink/switchlink_link_test.cc
+6 −1 switchlink/switchlink_neigh.c
+10 −2 switchlink/switchlink_route.c
+5 −1 switchsai/CMakeLists.txt
+3 −0 switchsai/sai.c
+365 −0 switchsai/sailag.c