Commit a3704425 authored by Ghislain MARY's avatar Ghislain MARY

ortp now depends on bctoolbox.

parent a15eea5b
...@@ -107,6 +107,7 @@ else() ...@@ -107,6 +107,7 @@ else()
if(_target_found GREATER -1) if(_target_found GREATER -1)
add_custom_target(TARGET_ortp ALL) add_custom_target(TARGET_ortp ALL)
add_dependencies(TARGET_linphone_builder TARGET_ortp) add_dependencies(TARGET_linphone_builder TARGET_ortp)
add_dependencies(TARGET_ortp TARGET_bctoolbox)
linphone_builder_add_builder_to_target(TARGET_ortp ortp) linphone_builder_add_builder_to_target(TARGET_ortp ortp)
endif() endif()
......
...@@ -32,6 +32,7 @@ if(EP_ortp_FORCE_AUTOTOOLS) ...@@ -32,6 +32,7 @@ if(EP_ortp_FORCE_AUTOTOOLS)
else() else()
set(EP_ortp_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE}) set(EP_ortp_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
endif() endif()
set(EP_ortp_DEPENDENCIES EP_bctoolbox)
if(MSVC) if(MSVC)
set(EP_ortp_EXTRA_LDFLAGS "/SAFESEH:NO") set(EP_ortp_EXTRA_LDFLAGS "/SAFESEH:NO")
endif() endif()
......
...@@ -185,7 +185,7 @@ macro(linphone_builder_create_targets_list) ...@@ -185,7 +185,7 @@ macro(linphone_builder_create_targets_list)
if(LINPHONE_BUILDER_TARGET STREQUAL "belle-sip") if(LINPHONE_BUILDER_TARGET STREQUAL "belle-sip")
list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "belle-sip") list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "belle-sip")
elseif(LINPHONE_BUILDER_TARGET STREQUAL "ortp") elseif(LINPHONE_BUILDER_TARGET STREQUAL "ortp")
list(APPEND LINPHONE_BUILDER_TARGETS "ortp") list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "ortp")
elseif(LINPHONE_BUILDER_TARGET STREQUAL "ms2") elseif(LINPHONE_BUILDER_TARGET STREQUAL "ms2")
list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "ortp" "ms2") list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "ortp" "ms2")
elseif(LINPHONE_BUILDER_TARGET STREQUAL "ms2-plugins") elseif(LINPHONE_BUILDER_TARGET STREQUAL "ms2-plugins")
......
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