From 9d8ed7ca075e67fbda839fe58d85e2080f2d0c05 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 9 Oct 2015 13:50:03 +0200 Subject: [PATCH] Allow inclusion of CMake project in a global CMake project. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f5e70..e5d77ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,11 @@ option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." YES) option(ENABLE_STATIC "Build static library (default is shared library)." NO) if(ENABLE_MSPLUGIN) - find_package(Mediastreamer2) + if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) + include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake") + else() + find_package(Mediastreamer2) + endif() if(NOT MEDIASTREAMER2_FOUND) message(WARNING "Could not find the mediastreamer2 libraries!") @@ -74,7 +78,7 @@ if(ENABLE_MSPLUGIN) add_subdirectory(msbcg729) endif() if(ENABLE_TESTS) - add_subdirectory(test) + #add_subdirectory(test) endif()