mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-30 01:39:20 +00:00
move vcard declaration on top of cmake to workaround a cmake builder issue.
This commit is contained in:
parent
a5361924f2
commit
7727eeb4ba
1 changed files with 14 additions and 13 deletions
|
|
@ -102,6 +102,20 @@ endif()
|
|||
# find_package should be invoked here to check for libraries - however do NOT
|
||||
# call include_directories here (see below)
|
||||
|
||||
if (ENABLE_VCARD)
|
||||
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)
|
||||
else()
|
||||
add_definitions(-DVCARD_ENABLED)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
|
||||
include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
|
||||
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
|
||||
|
|
@ -166,19 +180,6 @@ endif()
|
|||
if(ENABLE_LIME)
|
||||
set(HAVE_LIME 1)
|
||||
endif()
|
||||
if (ENABLE_VCARD)
|
||||
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)
|
||||
else()
|
||||
add_definitions(-DVCARD_ENABLED)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
include(CheckIncludeFiles)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue