Skip to content

FreeBSD: link against libpcap #493

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FreeBSD: link against libpcap #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 26 additions & 14 deletions cmake/FindPCAP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,20 @@ find_path(PCAP_INCLUDE_DIR
# set(LIB_PATH_SUFFIXES x86)
# endif ()

# find_library(PCAP_LIBRARY
# NAMES
# pcap pcap_static libpcap libpcap_static
# HINTS
# ENV PCAP_DIR
# PATH_SUFFIXES
# ${LIB_PATH_SUFFIXES}
# PATHS
# ${PCAP_PATH}
# )
# ## message(STATUS "LIB_PATH_SUFFIXES ${LIB_PATH_SUFFIXES}")
# ## message(STATUS "PCAP_LIBRARY is ${PCAP_LIBRARY}")
if (NEED_PCAP_LIBRARY)^M
find_library(PCAP_LIBRARY^M
NAMES^M
pcap pcap_static libpcap libpcap_static^M
HINTS^M
ENV PCAP_DIR^M
PATH_SUFFIXES^M
${LIB_PATH_SUFFIXES}^M
PATHS^M
${PCAP_PATH}^M
)^M
message(STATUS "LIB_PATH_SUFFIXES ${LIB_PATH_SUFFIXES}")^M
message(STATUS "PCAP_LIBRARY is ${PCAP_LIBRARY}")^M
endif()^M

# if (WIN32 AND PCAP_LIBRARY)
# ## Only worry about the packet library on Windows.
Expand All @@ -62,15 +64,25 @@ find_path(PCAP_INCLUDE_DIR
# endif (WIN32 AND PCAP_LIBRARY)
# ## message(STATUS "PACKET_LIBRARY is ${PACKET_LIBRARY}")

# set(PCAP_LIBRARIES ${PCAP_LIBRARY} ${PACKET_LIBRARY})
if (NEED_PCAP_LIBRARY)^M
set(PCAP_LIBRARIES ${PCAP_LIBRARY} ${PACKET_LIBRARY})^M
endif()^M
set(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})
unset(PCAP_LIBRARY)
unset(PCAP_INCLUDE_DIR)

include(FindPackageHandleStandardArgs)
if (NEED_PCAP_LIBRARY)^M
find_package_handle_standard_args(^M
PCAP^M
REQUIRED_VARS^M
PCAP_LIBRARIES^M
PCAP_INCLUDE_DIRS^M
)^M
else()^M
find_package_handle_standard_args(
PCAP
REQUIRED_VARS
## PCAP_LIBRARIES
PCAP_INCLUDE_DIRS
)
endif()^M
4 changes: 4 additions & 0 deletions cmake/dep-link.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ if (WITH_NETWORK)
endforeach()

target_include_directories(simh_network INTERFACE "${PCAP_INCLUDE_DIRS}")
if (NEED_PCAP_LIBRARY)^M
target_link_directories(simh_network INTERFACE "${PCAP_LIBRARY_DIRS}")^M
target_link_libraries(simh_network INTERFACE "${PCAP_LIBRARIES}")^M
endif ()^M
target_compile_definitions(simh_network INTERFACE HAVE_PCAP_NETWORK)
endif ()
endif ()
Expand Down
5 changes: 5 additions & 0 deletions cmake/platform-quirks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,8 @@ if (CMAKE_HOST_APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
endif ()
endif()
^M
set(NEED_PCAP_LIBRARY FALSE)^M
if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")^M
set(NEED_PCAP_LIBRARY TRUE)^M
endif()^M