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

Clean flexisip options.

parent 5a5ec9d1
......@@ -210,23 +210,21 @@ else()
if(_target_found GREATER -1)
add_custom_target(TARGET_flexisip ALL)
add_dependencies(TARGET_linphone_builder TARGET_flexisip)
add_dependencies(TARGET_flexisip TARGET_ortp )
if( USE_BC_ODBC )
linphone_builder_add_builder_to_target(TARGET_flexisip unixodbc )
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc )
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip sofiasip )
if ( ENABLE_ODB )
linphone_builder_add_builder_to_target(TARGET_flexisip odb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodb )
linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql )
endif()
if ( ENABLE_REDIS )
linphone_builder_add_builder_to_target(TARGET_flexisip hiredis )
add_dependencies(TARGET_flexisip TARGET_ortp)
if(ENABLE_BC_ODBC)
linphone_builder_add_builder_to_target(TARGET_flexisip unixodbc)
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc)
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip sofiasip)
if(ENABLE_ODB)
linphone_builder_add_builder_to_target(TARGET_flexisip odb)
linphone_builder_add_builder_to_target(TARGET_flexisip libodb)
linphone_builder_add_builder_to_target(TARGET_flexisip libodbmysql)
endif()
if(ENABLE_REDIS)
linphone_builder_add_builder_to_target(TARGET_flexisip hiredis)
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip flexisip )
linphone_builder_add_builder_to_target(TARGET_flexisip flexisip)
endif()
endif()
......@@ -47,7 +47,7 @@ endif()
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODBC=${ENABLE_ODBC}")
if(ENABLE_ODBC)
if(USE_BC_ODBC)
if(ENABLE_BC_ODBC)
message(STATUS "Flexisip to be built with BC ODBC")
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--with-odbc=${CMAKE_INSTALL_PREFIX}")
list(APPEND EP_flexisip_DEPENDENCIES EP_unixodbc EP_myodbc)
......
############################################################################
# config-flexisip.cmake
# config-flexisip-rpm.cmake
# Copyright (C) 2014 Belledonne Communications, Grenoble France
#
############################################################################
......@@ -67,38 +67,16 @@ FOREACH(LIBNAME ${FLEXISIP_LIBDEPS})
ENDFOREACH()
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
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)
set(DEFAULT_VALUE_ENABLE_GSM OFF)
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 OFF)
set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
set(DEFAULT_VALUE_ENABLE_X264 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)
set(DEFAULT_VALUE_ENABLE_ODBC ON)
# 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_REDIS ON)
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_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
# Global configuration
set(LINPHONE_BUILDER_HOST "")
......@@ -148,7 +126,7 @@ set(EP_sofiasip_RPMBUILD_OPTIONS "--with bc --without glib")
set(EP_hiredis_RPMBUILD_OPTIONS "--with bc" )
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --without transcoder --without boostlog --with push")
if( USE_BC_ODBC )
if(ENABLE_BC_ODBC)
set(EP_unixodbc_BUILD_METHOD "rpm")
set(EP_myodbc_BUILD_METHOD "rpm")
set(EP_unixodbc_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
......
......@@ -20,38 +20,16 @@
#
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
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)
set(DEFAULT_VALUE_ENABLE_GSM OFF)
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 OFF)
set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
set(DEFAULT_VALUE_ENABLE_X264 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)
set(DEFAULT_VALUE_ENABLE_ODBC ON)
# 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_REDIS ON)
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)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
# Global configuration
......
......@@ -27,10 +27,10 @@ add_feature_info("ODB" ENABLE_ODB "Enable odb support.")
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)
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})
add_feature_info("PUSHNOTIFICATION" ENABLE_PUSHNOTIFICATION "Enable push notification support.")
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