Add option to enable/disable pcap + clean options default values.

builders/ms2.cmake

@@ -36,6 +36,7 @@ set(EP_ms2_CMAKE_OPTIONS
 	"-DENABLE_NON_FREE_CODECS=${ENABLE_NON_FREE_CODECS}"
 	"-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}"
 	"-DENABLE_DEBUG_LOGS=${ENABLE_DEBUG_LOGS}"
+	"-DENABLE_PCAP=${ENABLE_PCAP}"
 )
 
 list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_GSM=${ENABLE_GSM}")

configs/config-bb10-arm.cmake

@@ -20,10 +20,10 @@
 #
 ############################################################################
 
-set(DEFAULT_VALUE_ENABLE_VPX ON)
-
 include(configs/config-bb10.cmake)
 
+set(DEFAULT_VALUE_ENABLE_VPX ON)
+
 # Global configuration
 set(LINPHONE_BUILDER_CFLAGS "${LINPHONE_BUILDER_CFLAGS} -march=armv7-a -mfpu=neon")
 

configs/config-bb10-i486.cmake

@@ -20,6 +20,4 @@
 #
 ############################################################################
 
-set(DEFAULT_VALUE_ENABLE_VPX OFF)
-
 include(configs/config-bb10.cmake)

configs/config-bb10.cmake

@@ -21,25 +21,16 @@
 ############################################################################
 
 # Define default values for the linphone builder options
-set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
-set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
-set(DEFAULT_VALUE_ENABLE_ZRTP ON)
-set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
-set(DEFAULT_VALUE_ENABLE_ILBC OFF)
-set(DEFAULT_VALUE_ENABLE_ISAC OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
-set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
+set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
+set(DEFAULT_VALUE_ENABLE_VIDEO ON)
+set(DEFAULT_VALUE_ENABLE_ZRTP ON)
+
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
-set(DEFAULT_VALUE_ENABLE_MKV OFF)
 
 # Global configuration
 get_filename_component(COMPILER_NAME ${CMAKE_C_COMPILER} NAME)

configs/config-desktop.cmake

@@ -31,18 +31,14 @@ set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 if(WIN32 OR APPLE)
 	set(DEFAULT_VALUE_ENABLE_PACKAGING ON)
-else()
-	set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
 endif()
 set(DEFAULT_VALUE_ENABLE_SILK ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")

configs/config-flexisip-rpm.cmake

@@ -68,13 +68,9 @@ ENDFOREACH()
 
 
 # Define default values for the flexisip builder options
-set(DEFAULT_VALUE_ENABLE_BC_ODBC OFF)
-set(DEFAULT_VALUE_ENABLE_ODB OFF)
 set(DEFAULT_VALUE_ENABLE_ODBC ON)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
 set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
 set(DEFAULT_VALUE_ENABLE_REDIS ON)
-set(DEFAULT_VALUE_ENABLE_PRESENCE OFF)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
 

configs/config-flexisip.cmake

@@ -24,7 +24,6 @@
 set(DEFAULT_VALUE_ENABLE_BC_ODBC OFF)
 set(DEFAULT_VALUE_ENABLE_ODB OFF)
 set(DEFAULT_VALUE_ENABLE_ODBC ON)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
 set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
 set(DEFAULT_VALUE_ENABLE_REDIS ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
@@ -34,25 +33,7 @@ set(DEFAULT_VALUE_ENABLE_SNMP ON)
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
 
 # ms2 default values
-set(DEFAULT_VALUE_ENABLE_DTLS OFF)
-set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
-set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES OFF)
-set(DEFAULT_VALUE_ENABLE_GSM OFF)
-set(DEFAULT_VALUE_ENABLE_ILBC OFF)
-set(DEFAULT_VALUE_ENABLE_ISAC OFF)
-set(DEFAULT_VALUE_ENABLE_MKV OFF)
-set(DEFAULT_VALUE_ENABLE_OPUS OFF)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
-set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
-set(DEFAULT_VALUE_ENABLE_SRTP OFF)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
-set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
-set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
-set(DEFAULT_VALUE_ENABLE_VPX OFF)
-set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
-set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 
 
 # Global configuration

configs/config-ios.cmake

@@ -27,18 +27,13 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC ON)
 set(DEFAULT_VALUE_ENABLE_ISAC ON)
-set(DEFAULT_VALUE_ENABLE_MKV OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
-set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")

configs/config-python.cmake

@@ -21,24 +21,16 @@
 ############################################################################
 
 # Define default values for the linphone builder options
-set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
-set(DEFAULT_VALUE_ENABLE_ILBC OFF)
-set(DEFAULT_VALUE_ENABLE_ISAC OFF)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
-set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
-set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")

configs/config-webplugin.cmake

@@ -21,25 +21,14 @@
 ############################################################################
 
 # Define default values for the linphone builder options
-set(DEFAULT_VALUE_ENABLE_DTLS OFF)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
-set(DEFAULT_VALUE_ENABLE_GSM OFF)
-set(DEFAULT_VALUE_ENABLE_ILBC OFF)
-set(DEFAULT_VALUE_ENABLE_ISAC OFF)
-set(DEFAULT_VALUE_ENABLE_MKV OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
-set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
-set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
-set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
-set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
 

configs/config-windowsphone.cmake

@@ -22,24 +22,13 @@
 
 # Define default values for the linphone builder options
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
-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_GSM ON)
-set(DEFAULT_VALUE_ENABLE_ILBC OFF)
-set(DEFAULT_VALUE_ENABLE_ISAC OFF)
-set(DEFAULT_VALUE_ENABLE_OPUS OFF)
-set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
-set(DEFAULT_VALUE_ENABLE_VPX OFF)
-set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
-set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
+
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
-set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
 
 
 # Global configuration

options/belle-sip.cmake

@@ -22,7 +22,7 @@
 
 # belle-sip build options
 
-option(ENABLE_TUNNEL "Enable tunnel support." ${DEFAULT_VALUE_ENABLE_TUNNEL})
+option(ENABLE_TUNNEL "Enable tunnel support." "${DEFAULT_VALUE_ENABLE_TUNNEL}")
 add_feature_info("Tunnel" ENABLE_TUNNEL "Secure tunnel for SIP/RTP (require license).")
 option(ENABLE_RTP_MAP_ALWAYS_IN_SDP "Always include rtpmap in SDP." OFF)
 add_feature_info("RTP MAP" ENABLE_RTP_MAP_ALWAYS_IN_SDP "Always include rtpmap in SDP.")

options/common.cmake

@@ -22,11 +22,11 @@
 
 # Common build options
 
-option(ENABLE_UNIT_TESTS "Enable unit tests support with CUnit library." ${DEFAULT_VALUE_ENABLE_UNIT_TESTS})
+option(ENABLE_UNIT_TESTS "Enable unit tests support with CUnit library." "${DEFAULT_VALUE_ENABLE_UNIT_TESTS}")
 add_feature_info("Unit tests" ENABLE_UNIT_TESTS "Build unit tests programs for belle-sip, mediastreamer2 and linphone.")
 option(ENABLE_DEBUG_LOGS "Enable debug level logs in libinphone and mediastreamer2." NO)
 
-option(ENABLE_PACKAGING "Enable packaging" ${DEFAULT_VALUE_ENABLE_PACKAGING})
+option(ENABLE_PACKAGING "Enable packaging" "${DEFAULT_VALUE_ENABLE_PACKAGING}")
 
 option(ENABLE_DOC "Enable documentation generation with Doxygen." YES)
 add_feature_info("Documentation" ENABLE_DOC "Enable documentation generation with Doxygen.")

options/flexisip.cmake

@@ -22,24 +22,24 @@
 
 # Flexisip build options
 
-option(ENABLE_ODB "Enable odb support." ${DEFAULT_VALUE_ENABLE_ODB})
+option(ENABLE_ODB "Enable odb support." "${DEFAULT_VALUE_ENABLE_ODB}")
 add_feature_info("ODB" ENABLE_ODB "Enable odb support.")
 
-option(ENABLE_ODBC "Enable odbc support." ${DEFAULT_VALUE_ENABLE_ODBC})
+option(ENABLE_ODBC "Enable odbc support." "${DEFAULT_VALUE_ENABLE_ODBC}")
 add_feature_info("ODBC" ENABLE_ODBC "Enable odbc support.")
-cmake_dependent_option(ENABLE_BC_ODBC "Enable odbc support from Belledonne Communications." ${DEFAULT_VALUE_ENABLE_BC_ODBC} "ENABLE_ODBC" OFF)
+cmake_dependent_option(ENABLE_BC_ODBC "Enable odbc support from Belledonne Communications." "${DEFAULT_VALUE_ENABLE_BC_ODBC}" "ENABLE_ODBC" OFF)
 
-option(ENABLE_REDIS "Enable hiredis support." ${DEFAULT_VALUE_ENABLE_REDIS})
+option(ENABLE_REDIS "Enable hiredis support." "${DEFAULT_VALUE_ENABLE_REDIS}")
 add_feature_info("REDIS" ENABLE_REDIS "Enable hiredis support.")
 
-option(ENABLE_PUSHNOTIFICATION "Enable push notification support." ${DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION})
+option(ENABLE_PUSHNOTIFICATION "Enable push notification support." "${DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION}")
 add_feature_info("PUSHNOTIFICATION" ENABLE_PUSHNOTIFICATION "Enable push notification support.")
 
-option(ENABLE_PRESENCE "Enable presence server support." ${DEFAULT_VALUE_ENABLE_PRESENCE})
+option(ENABLE_PRESENCE "Enable presence server support." "${DEFAULT_VALUE_ENABLE_PRESENCE}")
 add_feature_info("PRESENCE" ENABLE_PRESENCE "Enable presence server.")
 
 option(XSDCXX_ROOT_PATH "Path of where the bin/xsdcxx executable will be found. Comes from http://www.codesynthesis.com/products/xsd/download.xhtml" "/usr" )
 add_feature_info("XSDCXX_ROOT_PATH" XSDCXX_ROOT_PATH "Path of where the bin/xsdcxx executable will be found. Comes from http://www.codesynthesis.com/products/xsd/download.xhtml")
 
-option(ENABLE_SNMP "Enable SNMP support" ${DEFAULT_ENABLE_SNMP} )
+option(ENABLE_SNMP "Enable SNMP support" "${DEFAULT_ENABLE_SNMP}")
 add_feature_info("ENABLE_SNMP" ENABLE_SNMP "Enable SNMP support")

options/linphone.cmake

+############################################################################
+# linphone.cmake
+# Copyright (C) 2015  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+############################################################################
+
+# Linphone build options
+
 option(ENABLE_NLS "Enable internationalization of Linphone and Liblinphone." ON)
 add_feature_info("NLS" ENABLE_NLS "Enable internationalization of Linphone and Liblinphone. (Only for the desktop target)")
 

options/ms2.cmake

@@ -40,43 +40,46 @@ macro (ms2_add_option NAME DESCRIPTION DEFAULT_VALUE)
 	add_feature_info("${NAME}" "ENABLE_${UPPERCASE_NAME}" "${DESCRIPTION}")
 endmacro()
 
-ms2_add_option("GPL third parties" "Usage of GPL third-party code (FFmpeg and x264)." ${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES})
+ms2_add_option("GPL third parties" "Usage of GPL third-party code (FFmpeg and x264)." "${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES}")
 ms2_add_option("Non free codecs" "Allow inclusion of non-free codecs in the build." OFF)
 
 #security options
-ms2_add_option("SRTP" "SRTP media encryption support." ${DEFAULT_VALUE_ENABLE_SRTP})
-ms2_add_dependent_option("ZRTP" "ZRTP media encryption support." ${DEFAULT_VALUE_ENABLE_ZRTP} "ENABLE_SRTP" OFF)
-ms2_add_dependent_option("DTLS" "DTLS media encryption support." ${DEFAULT_VALUE_ENABLE_DTLS} "ENABLE_SRTP" OFF)
+ms2_add_option("SRTP" "SRTP media encryption support." "${DEFAULT_VALUE_ENABLE_SRTP}")
+ms2_add_dependent_option("ZRTP" "ZRTP media encryption support." "${DEFAULT_VALUE_ENABLE_ZRTP}" "ENABLE_SRTP" OFF)
+ms2_add_dependent_option("DTLS" "DTLS media encryption support." "${DEFAULT_VALUE_ENABLE_DTLS}" "ENABLE_SRTP" OFF)
 
 #audio options and codecs
-ms2_add_option("WebRTC AEC" "WebRTC echo canceller support." ${DEFAULT_VALUE_ENABLE_WEBRTC_AEC})
-ms2_add_dependent_option("WASAPI" "Windows Audio Session API (WASAPI) sound card support." ${DEFAULT_VALUE_ENABLE_WASAPI} "MSVC" OFF)
+ms2_add_option("WebRTC AEC" "WebRTC echo canceller support." "${DEFAULT_VALUE_ENABLE_WEBRTC_AEC}")
+ms2_add_dependent_option("WASAPI" "Windows Audio Session API (WASAPI) sound card support." "${DEFAULT_VALUE_ENABLE_WASAPI}" "MSVC" OFF)
 ms2_add_dependent_option("AMRNB" "AMR narrow-band audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
 ms2_add_dependent_option("AMRWB" "AMR wide-band audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
 if(ENABLE_AMRNB OR ENABLE_AMRWB)
 	set(ENABLE_AMR ON CACHE BOOL "" FORCE)
 endif()
 ms2_add_dependent_option("G729" "G.729 audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
-ms2_add_option("GSM"  "GSM audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_GSM})
-ms2_add_option("iLBC"  "iLBC audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_ILBC})
-ms2_add_option("ISAC"  "ISAC audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_ISAC})
-ms2_add_option("OPUS"  "OPUS audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_OPUS})
-ms2_add_option("Silk"  "Silk audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_SILK})
-ms2_add_option("Speex"  "Speex audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_SPEEX})
+ms2_add_option("GSM"  "GSM audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_GSM}")
+ms2_add_option("iLBC"  "iLBC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ILBC}")
+ms2_add_option("ISAC"  "ISAC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ISAC}")
+ms2_add_option("OPUS"  "OPUS audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_OPUS}")
+ms2_add_option("Silk"  "Silk audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_SILK}")
+ms2_add_option("Speex"  "Speex audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_SPEEX}")
 
 #video options and codecs
-ms2_add_option("Video" "Ability to capture and display video." ${DEFAULT_VALUE_ENABLE_VIDEO})
+ms2_add_option("Video" "Ability to capture and display video." "${DEFAULT_VALUE_ENABLE_VIDEO}")
 # FFMpeg is LGPL which is an issue only for iOS applications; otherwise it can be used in proprietary software as well
 set(FFMPEG_DEPENDENT_PRED "ENABLE_VIDEO")
 if (IOS)
 	set(FFMPEG_DEPENDENT_PRED "${FFMPEG_DEPENDENT_PRED};ENABLE_GPL_THIRD_PARTIES")
 endif()
-ms2_add_dependent_option("FFmpeg" "Some video processing features via FFmpeg: JPEG encoding/decoding, video scaling, H264 decoding..." ${DEFAULT_VALUE_ENABLE_FFMPEG} "${FFMPEG_DEPENDENT_PRED}" OFF)
+ms2_add_dependent_option("FFmpeg" "Some video processing features via FFmpeg: JPEG encoding/decoding, video scaling, H264 decoding..." "${DEFAULT_VALUE_ENABLE_FFMPEG}" "${FFMPEG_DEPENDENT_PRED}" OFF)
 ms2_add_dependent_option("H263" "H263 video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
 ms2_add_dependent_option("H263p" "H263+ video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
-ms2_add_option("MKV" "MKV playing and recording support." ${DEFAULT_VALUE_ENABLE_MKV})
+ms2_add_option("MKV" "MKV playing and recording support." "${DEFAULT_VALUE_ENABLE_MKV}")
 ms2_add_dependent_option("MPEG4" "MPEG4 video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
 ms2_add_dependent_option("OpenH264" "H.264 video encoding/decoding support with the openh264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
 ms2_add_dependent_option("V4L" "V4L camera driver." ON "ENABLE_VIDEO; UNIX; NOT APPLE; NOT QNX" OFF)
-ms2_add_dependent_option("VPX" "VPX (VP8) video encoding/decoding support." ${DEFAULT_VALUE_ENABLE_VPX} "ENABLE_VIDEO" OFF)
+ms2_add_dependent_option("VPX" "VPX (VP8) video encoding/decoding support." "${DEFAULT_VALUE_ENABLE_VPX}" "ENABLE_VIDEO" OFF)
 ms2_add_dependent_option("X264" "H.264 video encoding support with the x264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
+
+# Other options
+ms2_add_option("PCAP" "PCAP support." "${DEFAULT_VALUE_ENABLE_PCAP}")