witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Allow inclusion of CMake project in a global CMake project.

Browse source
This commit is contained in:
Ghislain MARY 2015-10-05 17:52:48 +02:00
parent 6f84ae6790
commit b3c247b6d7
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -87,8 +87,13 @@ if(MSVC)
endif()
endif()
find_package(BelleSIP REQUIRED)
find_package(Mediastreamer2 REQUIRED)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
else()
find_package(BelleSIP REQUIRED)
find_package(Mediastreamer2 REQUIRED)
endif()
find_package(XML2 REQUIRED)
find_package(Zlib)
if(ENABLE_UNIT_TESTS)

2
coreapi/help/CMakeLists.txt
View file

@ -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(doc ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html")
add_custom_target(linphone-doc ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html")
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
DESTINATION "share/doc/linphone-${LINPHONE_VERSION}")
else()

2
mediastreamer2

@ -1 +1 @@
Subproject commit 67fd090ce4c4845edfeda08050f4d0bb25281241
Subproject commit 8eee009590dffc7db91a355c6f28e5ac1f3622c9

2
oRTP

@ -1 +1 @@
Subproject commit 66fcf36abb30ddf65ca3f99d9bd0aecf8085e5f3
Subproject commit 848c3402122d1249cfe583b66ca8d21857c3d916

1
tester/CMakeLists.txt
View file

@ -82,4 +82,3 @@ else()
target_link_libraries(liblinphone_tester linphone ${GTK2_LIBRARIES})
endif()
endif()