From 33f261bc82384b463e647f013a6d1529b27f42cc Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 19 Apr 2017 12:27:05 +0200 Subject: [PATCH] remove direct build dependency on BZRTP unless LIME enabled --- CMakeLists.txt | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a63f9f11d..caca495c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,7 @@ option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO) option(ENABLE_GTK_UI "Turn on or off compilation of gtk interface." YES) option(ENABLE_LDAP "Enable LDAP support." NO) option(ENABLE_SQLITE_STORAGE "Turn on compilation sqlite storage, for messages, contacts, history" YES) -option(ENABLE_ZRTP "Buid linphone with ZRTP support" YES) -cmake_dependent_option(ENABLE_LIME "Enable Instant Messaging Encryption." YES "ENABLE_ZRTP;ENABLE_SQLITE_STORAGE" NO) +cmake_dependent_option(ENABLE_LIME "Enable Instant Messaging Encryption." YES "ENABLE_SQLITE_STORAGE" NO) cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO) option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO) option(ENABLE_STRICT "Build with strict compile options." YES) @@ -172,27 +171,14 @@ if(ENABLE_NLS) find_package(Gettext REQUIRED) find_package(Intl REQUIRED) endif() -if(ENABLE_ZRTP) +if(ENABLE_LIME) + #bzrtp is only required for LIME if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) include("${EP_bzrtp_CONFIG_DIR}/BZRTPConfig.cmake") else() - find_package(BZRTP) + find_package(BZRTP REQUIRED) endif() - if(NOT BZRTP_FOUND) - message(WARNING "Could not find bzrtp library, linphone will be compiled without ZRTP support.") - set(ENABLE_ZRTP OFF CACHE BOOL "Build linphone with ZRTP support." FORCE) - endif() -endif() -if(ENABLE_LIME) - if(BZRTP_FOUND) - set(HAVE_LIME 1) - else() - message(WARNING "LIME enabled but could not find bzrtp library, linphone will be compiled without LIME support.") - set(ENABLE_LIME OFF CACHE BOOL "Enable Instant Messaging Encryption." FORCE) - endif() -endif() -if(BZRTP_FOUND) - set(HAVE_ZRTP 1) + set(HAVE_LIME 1) endif() if(ENABLE_CXX_WRAPPER) find_package(PythonInterp REQUIRED)