Commit 685beb16 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Export correct libraries when building with CMake.

parent b0b5814e
...@@ -40,6 +40,7 @@ else() ...@@ -40,6 +40,7 @@ else()
find_package(ORTP REQUIRED) find_package(ORTP REQUIRED)
find_package(BcToolbox REQUIRED) find_package(BcToolbox REQUIRED)
endif() endif()
find_package(Matroska2)
if(@ENABLE_ZRTP@) if(@ENABLE_ZRTP@)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_bzrtp_CONFIG_DIR}/BZRTPConfig.cmake") include("${EP_bzrtp_CONFIG_DIR}/BZRTPConfig.cmake")
...@@ -54,9 +55,17 @@ if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) ...@@ -54,9 +55,17 @@ if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
else() 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) if(@ENABLE_SHARED@)
set(MEDIASTREAMER2_LIBRARIES mediastreamer_base mediastreamer_voip)
else()
set(MEDIASTREAMER2_LIBRARIES mediastreamer_base-static mediastreamer_voip-static)
endif()
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${BCTOOLBOX_INCLUDE_DIRS}) list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${BCTOOLBOX_INCLUDE_DIRS})
list(APPEND MEDIASTREAMER2_LIBRARIES ${ORTP_LIBRARIES} ${BCTOOLBOX_LIBRARIES}) list(APPEND MEDIASTREAMER2_LIBRARIES ${ORTP_LIBRARIES} ${BCTOOLBOX_LIBRARIES})
if(MATROSKA2_FOUND)
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${MATROSKA2_INCLUDE_DIRS})
list(APPEND MEDIASTREAMER2_LIBRARIES ${MATROSKA2_LIBRARIES})
endif()
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