Commit 1f209119 authored by Ghislain MARY's avatar Ghislain MARY

bctoolbox fixes.

parent ac611c42
......@@ -60,6 +60,20 @@ else()
add_custom_target(TARGET_linphone_builder ALL)
# Build bctoolbox and its dependencies if it is in the targets list
list(FIND LINPHONE_BUILDER_TARGETS "bctoolbox" _target_found)
if(_target_found GREATER -1)
add_custom_target(TARGET_bctoolbox ALL)
add_dependencies(TARGET_linphone_builder TARGET_bctoolbox)
if(ENABLE_MBEDTLS)
linphone_builder_add_builder_to_target(TARGET_bctoolbox mbedtls)
endif()
if(ENABLE_POLARSSL)
linphone_builder_add_builder_to_target(TARGET_bctoolbox polarssl)
endif()
linphone_builder_add_builder_to_target(TARGET_bctoolbox bctoolbox)
endif()
# Build belle-sip and its dependencies if it is in the targets list
list(FIND LINPHONE_BUILDER_TARGETS "belle-sip" _target_found)
if(_target_found GREATER -1)
......@@ -186,7 +200,7 @@ else()
if(_target_found GREATER -1)
add_custom_target(TARGET_linphone ALL)
add_dependencies(TARGET_linphone_builder TARGET_linphone)
add_dependencies(TARGET_linphone TARGET_bellesip TARGET_ortp TARGET_ms2 TARGET_bctoolbox)
add_dependencies(TARGET_linphone TARGET_bctoolbox TARGET_bellesip TARGET_ortp TARGET_ms2)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
if(NOT IOS)
# Do not build sqlite3, xml2 and zlib on IOS, they are provided by the system
......@@ -242,17 +256,4 @@ else()
linphone_builder_add_builder_to_target(TARGET_flexisip flexisip)
endif()
# Build bctoolbox and its dependencies if it is in the targets list
list(FIND LINPHONE_BUILDER_TARGETS "bctoolbox" _target_found)
if(_target_found GREATER -1)
add_custom_target(TARGET_bctoolbox ALL)
add_dependencies(TARGET_linphone_builder TARGET_bctoolbox)
if(ENABLE_MBEDTLS)
linphone_builder_add_builder_to_target(TARGET_linphone mbedtls)
endif()
if(ENABLE_POLARSSL)
linphone_builder_add_builder_to_target(TARGET_linphone polarssl)
endif()
linphone_builder_add_builder_to_target(TARGET_bctoolbox bctoolbox)
endif()
endif()
......@@ -27,9 +27,9 @@ set(EP_bellesip_EXTERNAL_SOURCE_PATHS "belle-sip")
set(EP_bellesip_GROUPABLE YES)
set(EP_bellesip_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_bellesip_DEPENDENCIES )
set(EP_bellesip_DEPENDENCIES EP_bctoolbox)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_bellesip_DEPENDENCIES EP_antlr3c EP_polarssl)
list(APPEND EP_bellesip_DEPENDENCIES EP_antlr3c)
endif()
if(MSVC)
set(EP_bellesip_EXTRA_LDFLAGS "/SAFESEH:NO")
......
......@@ -27,13 +27,10 @@ set(EP_bzrtp_EXTERNAL_SOURCE_PATHS "bzrtp")
set(EP_bzrtp_GROUPABLE YES)
set(EP_bzrtp_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_bzrtp_DEPENDENCIES )
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_bzrtp_DEPENDENCIES EP_polarssl)
if(NOT IOS)
# Do not build xml2 on IOS, it is provided by the system
list(APPEND EP_bzrtp_DEPENDENCIES EP_xml2)
endif()
set(EP_bzrtp_DEPENDENCIES EP_bctoolbox)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT IOS)
# Do not build xml2 on IOS, it is provided by the system
list(APPEND EP_bzrtp_DEPENDENCIES EP_xml2)
endif()
if(MSVC)
set(EP_bzrtp_EXTRA_LDFLAGS "/SAFESEH:NO")
......@@ -46,3 +43,4 @@ set(EP_bzrtp_CMAKE_OPTIONS "-DENABLE_TESTS=${ENABLE_UNIT_TESTS}")
if(ENABLE_UNIT_TESTS AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_bzrtp_DEPENDENCIES EP_cunit)
endif()
......@@ -81,10 +81,6 @@ list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_ZRTP=${ENABLE_ZRTP}")
if(ENABLE_ZRTP)
list(APPEND EP_ms2_DEPENDENCIES EP_bzrtp)
endif()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_DTLS=${ENABLE_DTLS}")
if(ENABLE_DTLS)
list(APPEND EP_ms2_DEPENDENCIES EP_polarssl)
endif()
if(ENABLE_DOC)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_DOC=YES")
else()
......
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