Commit 47945043 authored by Simon Morlat's avatar Simon Morlat

Fix flexisip build. It requires ADVANCED_IM for liblinphone, but does not...

Fix flexisip build. It requires ADVANCED_IM for liblinphone, but does not require Xerces to be compiled because it is available on the system.
parent b432d41a
......@@ -39,7 +39,7 @@ else()
set(ENABLE_ADVANCED_IM OFF CACHE BOOL "Enable advanced instant messaging such as group chat." FORCE)
endif()
if(ENABLE_ADVANCED_IM)
if(ENABLE_ADVANCED_IM AND NOT USE_SYSTEM_XSD)
lcb_dependencies("libxsd")
endif()
......
......@@ -67,13 +67,17 @@ endif()
set(DEFAULT_VALUE_ENABLE_TRANSCODER ON)
set(DEFAULT_VALUE_ENABLE_REDIS ON)
set(DEFAULT_VALUE_ENABLE_SOCI ON)
set(DEFAULT_VALUE_ENABLE_ASSETS ON)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
set(ENABLE_SRTP NO CACHE BOOL "" FORCE) # Mainly to avoid issues with old libsrtp (sha1_update conflict with polarssl)
set(DEFAULT_VALUE_ENABLE_ADVANCED_IM ON)
set(DEFAULT_VALUE_ENABLE_DB_STORAGE ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_SHARED=YES" "-DENABLE_STATIC=NO")
# Global configuration
set(LINPHONE_BUILDER_HOST "")
set(USE_SYSTEM_XSD YES)
set(RPM_INSTALL_PREFIX "/opt/belledonne-communications")
set(LINPHONE_BUILDER_RPMBUILD_PACKAGE_PREFIX "bc-")
......
......@@ -21,6 +21,8 @@
############################################################################
# Define default values for the flexisip builder options
set(DEFAULT_VALUE_ENABLE_ADVANCED_IM ON)
set(DEFAULT_VALUE_ENABLE_DB_STORAGE ON)
set(DEFAULT_VALUE_ENABLE_REDIS ON)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_ENABLE_PRESENCE ON)
......@@ -44,6 +46,7 @@ set(DEFAULT_VALUE_ENABLE_SPEEX ON)
# Global configuration
set(LINPHONE_BUILDER_HOST "")
set(USE_SYSTEM_XSD YES)
# Adjust PKG_CONFIG_PATH to include install directory
if(UNIX)
......
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