diff --git a/CMakeLists.txt b/CMakeLists.txt index de89c2d4b..5316eb316 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,11 @@ if(ENABLE_LIME) set(HAVE_LIME 1) endif() if (ENABLE_VCARD) - find_package(Belcard) + if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) + include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake") + else() + find_package(Belcard) + endif() if(NOT BELCARD_FOUND) message(WARNING "Could not find the belcard library!") set(ENABLE_VCARD OFF CACHE BOOL "Enable vcard support." FORCE) diff --git a/cmake/FindBelcard.cmake b/cmake/FindBelcard.cmake index bab59c2c1..4a50a3f2e 100644 --- a/cmake/FindBelcard.cmake +++ b/cmake/FindBelcard.cmake @@ -41,7 +41,7 @@ if(BELCARD_INCLUDE_DIRS) endif() find_library(BELCARD_LIBRARIES - NAMES belr belcard + NAMES belcard HINTS ${_BELCARD_ROOT_PATHS} PATH_SUFFIXES bin lib ) diff --git a/cmake/LinphoneConfig.cmake.in b/cmake/LinphoneConfig.cmake.in index 9bcd9dfa4..9a349cc41 100644 --- a/cmake/LinphoneConfig.cmake.in +++ b/cmake/LinphoneConfig.cmake.in @@ -38,6 +38,13 @@ find_package(BelleSIP REQUIRED) if(@ENABLE_TUNNEL@) find_package(Tunnel) endif() +if(@ENABLE_VCARD@) + if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) + include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake") + else() + find_package(Belcard) + endif() +endif() get_filename_component(LINPHONE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) set(LINPHONE_INCLUDE_DIRS "${LINPHONE_CMAKE_DIR}/../../../include") @@ -51,4 +58,8 @@ if(TUNNEL_FOUND) list(APPEND LINPHONE_INCLUDE_DIRS ${TUNNEL_INCLUDE_DIRS}) list(APPEND LINPHONE_LIBRARIES ${TUNNEL_LIBRARIES}) endif() +if(BELCARD_FOUND) + list(APPEND LINPHONE_INCLUDE_DIRS ${BELCARD_INCLUDE_DIRS}) + list(APPEND LINPHONE_LIBRARIES ${BELCARD_LIBRARIES}) +endif() set(LINPHONE_FOUND 1)