diff --git a/cmake/LinphoneConfig.cmake.in b/cmake/LinphoneConfig.cmake.in
index afb47f1db..25ab6cc6e 100644
--- a/cmake/LinphoneConfig.cmake.in
+++ b/cmake/LinphoneConfig.cmake.in
@@ -32,6 +32,13 @@
 if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
 	include("${CMAKE_CURRENT_LIST_DIR}/LinphoneTargets.cmake")
 endif()
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+        include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
+        include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
+else()
+	find_package(Mediastreamer2 REQUIRED)
+	find_package(BelleSIP REQUIRED)
+endif()
 
 if(@ENABLE_SHARED@)
 	set(LINPHONE_TARGETNAME linphone)
diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index 0b9e3b3fa..21051817a 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-if (ENABLE_DOC)
+if (ENABLE_DOC OR CXX_WRAPPER)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
 		if(DOXYGEN_DOT_FOUND)
@@ -39,7 +39,11 @@ if (ENABLE_DOC)
 			install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
 				DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/linphone-${LINPHONE_VERSION}")
 		else()
-			message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
+			if (CXX_WRAPPER) 
+				message(FATAL_ERROR "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
+			else()
+				message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
+			endif()
 		endif()
 	endif()
 endif()
diff --git a/wrappers/cpp/LinphoneCxxConfig.cmake.in b/wrappers/cpp/LinphoneCxxConfig.cmake.in
index 6ed42d720..c3a0f08d2 100644
--- a/wrappers/cpp/LinphoneCxxConfig.cmake.in
+++ b/wrappers/cpp/LinphoneCxxConfig.cmake.in
@@ -29,6 +29,13 @@
 #  LINPHONECXX_INCLUDE_DIRS - the linphone++ include directory
 #  LINPHONECXX_LIBRARIES - The libraries needed to use linphone++
 #  LINPHONECXX_LDFLAGS - The linking flags needed to use linphone++
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+        include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
+        include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
+else()
+        find_package(BelleSIP)
+        find_package(Linphone)
+endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/LinphoneCxxTargets.cmake")
 set(LINPHONECXX_LDFLAGS "")