Commit 75b3d999 authored by Sandrine Avakian's avatar Sandrine Avakian
Browse files

Merge branch 'master' of git.linphone.org:linphone-cmake-builder into dev_codecbv16

parents 2ee22440 f0f5657b
......@@ -71,6 +71,9 @@ else()
if(ENABLE_POLARSSL)
linphone_builder_add_builder_to_target(TARGET_bctoolbox polarssl)
endif()
if (ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_bctoolbox cunit)
endif()
linphone_builder_add_builder_to_target(TARGET_bctoolbox bctoolbox)
endif()
......@@ -84,9 +87,6 @@ else()
if( NOT DISABLE_BC_ANTLR)
linphone_builder_add_builder_to_target(TARGET_bellesip antlr3c)
endif()
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_bellesip cunit)
endif()
if(NOT IOS AND NOT QNX)
linphone_builder_add_builder_to_target(TARGET_bellesip zlib)
endif()
......@@ -114,9 +114,6 @@ else()
add_dependencies(TARGET_linphone_builder TARGET_ms2)
add_dependencies(TARGET_ms2 TARGET_ortp TARGET_bctoolbox)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_ms2 cunit)
endif()
if(ENABLE_GSM)
linphone_builder_add_builder_to_target(TARGET_ms2 gsm)
endif()
......@@ -218,9 +215,6 @@ else()
linphone_builder_add_builder_to_target(TARGET_linphone zlib)
endif()
endif()
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_linphone cunit)
endif()
endif()
if(ENABLE_TUNNEL)
linphone_builder_add_builder_to_target(TARGET_linphone tunnel)
......
......@@ -44,6 +44,7 @@ endif()
if(IOS)
list(APPEND EP_bctoolbox_CMAKE_OPTIONS "-DENABLE_STRICT=NO")
endif()
list(APPEND EP_bctoolbox_CMAKE_OPTIONS "-DENABLE_TESTS=${ENABLE_UNIT_TESTS}")
#list(APPEND EP_bctoolbox_CMAKE_OPTIONS "-DENABLE_TESTS=${ENABLE_UNIT_TESTS}")
#if(ENABLE_UNIT_TESTS AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
......
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