Add ENABLE_DTLS option.

builders/ms2.cmake

@@ -92,6 +92,12 @@ if(ENABLE_ZRTP)
 else()
 	list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_ZRTP=NO")
 endif()
+if(ENABLE_DTLS)
+	list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_DTLS=YES")
+	list(APPEND EP_ms2_DEPENDENCIES EP_polarssl)
+else()
+	list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_DTLS=NO")
+endif()
 if(ENABLE_UNIT_TESTS)
 	list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_UNIT_TESTS=YES")
 else()

cmake/LinphoneBuilderOptions.cmake

@@ -40,6 +40,8 @@ option(ENABLE_SRTP "Enable SRTP support." ${DEFAULT_VALUE_ENABLE_SRTP})
 linphone_builder_add_feature_info("SRTP" ENABLE_SRTP "SRTP media encryption support.")
 cmake_dependent_option(ENABLE_ZRTP "Enable ZRTP support." ${DEFAULT_VALUE_ENABLE_ZRTP} "ENABLE_SRTP" OFF)
 linphone_builder_add_feature_info("ZRTP" ENABLE_ZRTP "ZRTP media encryption support.")
+cmake_dependent_option(ENABLE_DTLS "Enable DTLS support." ${DEFAULT_VALUE_ENABLE_DTLS} "ENABLE_SRTP" OFF)
+linphone_builder_add_feature_info("DTLS" ENABLE_DTLS "DTLS media encryption support.")
 
 option(ENABLE_NON_FREE_CODECS "Allow inclusion of non-free codecs in the build." YES)
 option(ENABLE_AMRNB "Enable AMR narrow-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRNB})

configs/config-bb10.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
 set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)

configs/config-desktop.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB ON)
 set(DEFAULT_VALUE_ENABLE_AMRWB ON)
 set(DEFAULT_VALUE_ENABLE_G729 ON)

configs/config-flexisip.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES OFF)
 set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP OFF)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
 set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)

configs/config-ios.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB ON)
 set(DEFAULT_VALUE_ENABLE_AMRWB ON)
 set(DEFAULT_VALUE_ENABLE_G729 ON)

configs/config-python.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
 set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)

configs/config-webplugin.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
 set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)

configs/config-windowsphone.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES OFF)
 set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
+set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
 set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)