Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
8eee0095
Commit
8eee0095
authored
Oct 05, 2015
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow inclusion of CMake project in a global CMake project.
parent
67fd090c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
7 deletions
+19
-7
CMakeLists.txt
CMakeLists.txt
+5
-1
cmake/Mediastreamer2Config.cmake.in
cmake/Mediastreamer2Config.cmake.in
+13
-4
help/CMakeLists.txt
help/CMakeLists.txt
+1
-1
tools/CMakeLists.txt
tools/CMakeLists.txt
+0
-1
No files found.
CMakeLists.txt
View file @
8eee0095
...
...
@@ -128,7 +128,11 @@ check_library_exists("dl" "dlopen" "" HAVE_DLOPEN)
include
(
TestBigEndian
)
test_big_endian
(
WORDS_BIGENDIAN
)
find_package
(
ORTP REQUIRED
)
if
(
LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS
)
include
(
"
${
EP_ortp_CONFIG_DIR
}
/ORTPConfig.cmake"
)
else
()
find_package
(
ORTP REQUIRED
)
endif
()
find_package
(
PolarSSL
)
find_package
(
PCAP QUIET
)
...
...
cmake/Mediastreamer2Config.cmake.in
View file @
8eee0095
...
...
@@ -29,15 +29,24 @@
# MEDIASTREAMER2_CPPFLAGS - The compilation flags needed to use mediastreamer2
# MEDIASTREAMER2_LDFLAGS - The linking flags needed to use mediastreamer2
include("${CMAKE_CURRENT_LIST_DIR}/Mediastreamer2Targets.cmake")
find_package(ORTP REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/Mediastreamer2Targets.cmake" OPTIONAL)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_ortp_CONFIG_DIR}/ORTPConfig.cmake")
else()
find_package(ORTP REQUIRED)
endif()
if(@ENABLE_ZRTP@)
find_package(BZRTP)
endif()
get_filename_component(MEDIASTREAMER2_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(MEDIASTREAMER2_INCLUDE_DIRS "${MEDIASTREAMER2_CMAKE_DIR}/../../../include")
set(MEDIASTREAMER2_LIBRARIES BelledonneCommunications::mediastreamer_base BelledonneCommunications::mediastreamer_voip)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
set(MEDIASTREAMER2_INCLUDE_DIRS "${EP_ms2_INCLUDE_DIR}")
set(MEDIASTREAMER2_LIBRARIES mediastreamer_base mediastreamer_voip)
else()
set(MEDIASTREAMER2_INCLUDE_DIRS "${MEDIASTREAMER2_CMAKE_DIR}/../../../include")
set(MEDIASTREAMER2_LIBRARIES BelledonneCommunications::mediastreamer_base BelledonneCommunications::mediastreamer_voip)
endif()
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS})
list(APPEND MEDIASTREAMER2_LIBRARIES ${ORTP_LIBRARIES})
if(BZRTP_FOUND)
...
...
help/CMakeLists.txt
View file @
8eee0095
...
...
@@ -36,7 +36,7 @@ if(DOXYGEN_FOUND)
COMMAND
${
DOXYGEN_EXECUTABLE
}
${
CMAKE_CURRENT_BINARY_DIR
}
/Doxyfile
DEPENDS
${
CMAKE_CURRENT_BINARY_DIR
}
/Doxyfile
${
DOC_INPUT_FILES
}
)
add_custom_target
(
html-doc ALL DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/doc/html/index.html"
)
add_custom_target
(
ms2-
html-doc ALL DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/doc/html/index.html"
)
install
(
DIRECTORY
"
${
CMAKE_CURRENT_BINARY_DIR
}
/doc/html"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/share/doc/mediastreamer2-
${
MEDIASTREAMER_VERSION
}
"
)
else
()
...
...
tools/CMakeLists.txt
View file @
8eee0095
...
...
@@ -56,4 +56,3 @@ target_link_libraries(mkvstream mediastreamer_voip mediastreamer_base)
install
(
TARGETS mediastream mkvstream
RUNTIME DESTINATION bin
)
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