Commit 238c4f63 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix for bctoolbox finding with CMake.

parent 34cc77f8
...@@ -35,8 +35,10 @@ endif() ...@@ -35,8 +35,10 @@ endif()
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_ortp_CONFIG_DIR}/ORTPConfig.cmake") include("${EP_ortp_CONFIG_DIR}/ORTPConfig.cmake")
include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
else() else()
find_package(ORTP REQUIRED) find_package(ORTP REQUIRED)
find_package(BcToolbox REQUIRED)
endif() endif()
if(@ENABLE_ZRTP@) if(@ENABLE_ZRTP@)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
...@@ -53,8 +55,8 @@ else() ...@@ -53,8 +55,8 @@ else()
set(MEDIASTREAMER2_INCLUDE_DIRS "${MEDIASTREAMER2_CMAKE_DIR}/../../../include") set(MEDIASTREAMER2_INCLUDE_DIRS "${MEDIASTREAMER2_CMAKE_DIR}/../../../include")
endif() endif()
set(MEDIASTREAMER2_LIBRARIES mediastreamer_base mediastreamer_voip) set(MEDIASTREAMER2_LIBRARIES mediastreamer_base mediastreamer_voip)
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS}) list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${BCTOOLBOX_INCLUDE_DIRS})
list(APPEND MEDIASTREAMER2_LIBRARIES ${ORTP_LIBRARIES}) list(APPEND MEDIASTREAMER2_LIBRARIES ${ORTP_LIBRARIES} ${BCTOOLBOX_LIBRARIES})
if(BZRTP_FOUND) if(BZRTP_FOUND)
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${BZRTP_INCLUDE_DIRS}) list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${BZRTP_INCLUDE_DIRS})
list(APPEND MEDIASTREAMER2_LIBRARIES ${BZRTP_LIBRARIES}) list(APPEND MEDIASTREAMER2_LIBRARIES ${BZRTP_LIBRARIES})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment