Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
5065a3dc
Commit
5065a3dc
authored
May 12, 2015
by
Ghislain MARY
Browse files
Fix build of pcap_player when using CMake.
parent
49940c15
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
2 deletions
+11
-2
CMakeLists.txt
CMakeLists.txt
+7
-0
cmake/FindPCAP.cmake
cmake/FindPCAP.cmake
+0
-1
mediastreamer-config.h.cmake
mediastreamer-config.h.cmake
+1
-0
src/CMakeLists.txt
src/CMakeLists.txt
+3
-0
tools/CMakeLists.txt
tools/CMakeLists.txt
+0
-1
No files found.
CMakeLists.txt
View file @
5065a3dc
...
...
@@ -125,6 +125,7 @@ test_big_endian(WORDS_BIGENDIAN)
find_package
(
ORTP REQUIRED
)
find_package
(
PolarSSL
)
find_package
(
PCAP
)
if
(
ENABLE_UNIT_TESTS
)
find_package
(
CUnit
)
...
...
@@ -265,6 +266,9 @@ include_directories(
${
ORTP_INCLUDE_DIRS
}
)
if
(
PCAP_FOUND
)
include_directories
(
${
PCAP_INCLUDE_DIRS
}
)
endif
()
if
(
SRTP_FOUND
)
include_directories
(
${
SRTP_INCLUDE_DIRS
}
)
endif
()
...
...
@@ -330,6 +334,9 @@ endif()
if
(
ENABLE_NON_FREE_CODECS
)
set
(
HAVE_NON_FREE_CODECS 1
)
endif
()
if
(
PCAP_FOUND
)
set
(
HAVE_PCAP 1
)
endif
()
if
(
SRTP_FOUND
)
set
(
HAVE_SRTP 1
)
endif
()
...
...
cmake/FindPCAP.cmake
View file @
5065a3dc
...
...
@@ -27,7 +27,6 @@
# PCAP_LIBRARIES - The libraries needed to use pcap
set
(
_PCAP_ROOT_PATHS
${
WITH_PCAP
}
${
CMAKE_INSTALL_PREFIX
}
)
...
...
mediastreamer-config.h.cmake
View file @
5065a3dc
...
...
@@ -66,3 +66,4 @@
#cmakedefine HAVE_LINUX_VIDEODEV_H 1
#cmakedefine HAVE_LINUX_VIDEODEV2_H 1
#cmakedefine HAVE_POLARSSL_SSL_H 1
#cmakedefine HAVE_PCAP 1
src/CMakeLists.txt
View file @
5065a3dc
...
...
@@ -338,6 +338,9 @@ endif()
if
(
HAVE_DLOPEN
)
list
(
APPEND VOIP_LIBS dl
)
endif
()
if
(
PCAP_FOUND
)
list
(
APPEND VOIP_LIBS
${
PCAP_LIBRARIES
}
)
endif
()
if
(
BZRTP_FOUND
)
list
(
APPEND VOIP_LIBS
${
BZRTP_LIBRARIES
}
)
endif
()
...
...
tools/CMakeLists.txt
View file @
5065a3dc
...
...
@@ -29,7 +29,6 @@ foreach (simple_executable ${simple_executables})
target_link_libraries
(
${
simple_executable
}
mediastreamer_voip mediastreamer_base
)
endforeach
()
find_package
(
PCAP QUIET
)
if
(
PCAP_FOUND
)
add_executable
(
pcap_playback pcap_playback.c common.c
)
target_link_libraries
(
pcap_playback mediastreamer_voip mediastreamer_base
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment