From b3c247b6d73278c0fc35b56839867d93e1c7d296 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 5 Oct 2015 17:52:48 +0200
Subject: [PATCH] Allow inclusion of CMake project in a global CMake project.

---
 CMakeLists.txt              | 9 +++++++--
 coreapi/help/CMakeLists.txt | 2 +-
 mediastreamer2              | 2 +-
 oRTP                        | 2 +-
 tester/CMakeLists.txt       | 1 -
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5376a43a4..ffa41f349 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index fa6915d8f..2582a507a 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -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()
diff --git a/mediastreamer2 b/mediastreamer2
index 67fd090ce..8eee00959 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 67fd090ce4c4845edfeda08050f4d0bb25281241
+Subproject commit 8eee009590dffc7db91a355c6f28e5ac1f3622c9
diff --git a/oRTP b/oRTP
index 66fcf36ab..848c34021 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 66fcf36abb30ddf65ca3f99d9bd0aecf8085e5f3
+Subproject commit 848c3402122d1249cfe583b66ca8d21857c3d916
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index cef7f7a4f..1495c2709 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -82,4 +82,3 @@ else()
 		target_link_libraries(liblinphone_tester linphone ${GTK2_LIBRARIES})
 	endif()
 endif()
-