Commit 6c1aa0e9 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

It is now mediastreamer2 that depends on srtp and zrtp (no longer ortp).

parent 915f1c04
......@@ -52,14 +52,6 @@ if(_target_found GREATER -1)
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_ortp cunit)
endif()
if(ENABLE_SRTP)
linphone_builder_add_builder_to_target(TARGET_ortp srtp)
endif()
if(ENABLE_ZRTP)
linphone_builder_add_builder_to_target(TARGET_ortp polarssl)
linphone_builder_add_builder_to_target(TARGET_ortp xml2)
linphone_builder_add_builder_to_target(TARGET_ortp bzrtp)
endif()
linphone_builder_add_builder_to_target(TARGET_ortp ortp)
endif()
......@@ -91,6 +83,14 @@ if(_target_found GREATER -1)
if("${BUILD_V4L}" STREQUAL "yes")
linphone_builder_add_builder_to_target(TARGET_ms2 v4l)
endif()
if(ENABLE_SRTP)
linphone_builder_add_builder_to_target(TARGET_ms2 srtp)
endif()
if(ENABLE_ZRTP)
linphone_builder_add_builder_to_target(TARGET_ms2 polarssl)
linphone_builder_add_builder_to_target(TARGET_ms2 xml2)
linphone_builder_add_builder_to_target(TARGET_ms2 bzrtp)
endif()
linphone_builder_add_builder_to_target(TARGET_ms2 ms2)
endif()
......
......@@ -22,7 +22,7 @@
set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
set(EP_ms2_GIT_TAG_LATEST "master")
set(EP_ms2_GIT_TAG "88048b704ab31591ab447c318349139d649412d8")
set(EP_ms2_GIT_TAG "3623a4fe7c4c9700b3801aa4872b29acd99b554a")
set(EP_ms2_CMAKE_OPTIONS )
set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=NO")
......@@ -62,6 +62,18 @@ if(ENABLE_VIDEO)
else()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_VIDEO=NO")
endif()
if(ENABLE_SRTP)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SRTP=1")
list(APPEND EP_ms2_DEPENDENCIES EP_srtp)
else()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SRTP=0")
endif()
if(ENABLE_ZRTP)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_ZRTP=1")
list(APPEND EP_ms2_DEPENDENCIES EP_bzrtp)
else()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_ZRTP=0")
endif()
if(ENABLE_UNIT_TESTS)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_UNIT_TESTS=YES")
else()
......
......@@ -22,7 +22,7 @@
set(EP_ortp_GIT_REPOSITORY "git://git.linphone.org/ortp.git")
set(EP_ortp_GIT_TAG_LATEST "master")
set(EP_ortp_GIT_TAG "79806074d5707ade74048b37071c87f0e1decf6f")
set(EP_ortp_GIT_TAG "3ed7f2c775a9ee27eab70fab7bdf48e744d5bee2")
if("${EP_ortp_FORCE_AUTOTOOLS}" STREQUAL "yes")
set(EP_ortp_LINKING_TYPE "--enable-static")
......@@ -33,22 +33,6 @@ endif()
set(EP_ortp_CMAKE_OPTIONS )
set(EP_ortp_DEPENDENCIES )
if(ENABLE_SRTP)
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_SRTP=1")
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--enable-srtp")
list(APPEND EP_ortp_DEPENDENCIES EP_srtp)
else()
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_SRTP=0")
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--disable-srtp")
endif()
if(ENABLE_ZRTP)
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_ZRTP=1")
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--enable-zrtp")
list(APPEND EP_ortp_DEPENDENCIES EP_bzrtp)
else()
list(APPEND EP_ortp_CMAKE_OPTIONS "-DENABLE_ZRTP=0")
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--with-srtp=none")
endif()
if(MSVC)
set(EP_ortp_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
......
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