iOS: fix compilation and bctoolbox dependencies for tunnel

parent 39425dad
......@@ -87,7 +87,7 @@ else()
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_bellesip cunit)
endif()
if(NOT QNX)
if(NOT IOS AND NOT QNX)
linphone_builder_add_builder_to_target(TARGET_bellesip zlib)
endif()
endif()
......@@ -148,7 +148,7 @@ else()
endif()
endif()
endif()
if(ENABLE_ZRTP)
linphone_builder_add_builder_to_target(TARGET_ms2 bzrtp)
endif()
......@@ -237,7 +237,7 @@ else()
add_dependencies(TARGET_flexisip TARGET_ortp)
if(ENABLE_PRESENCE)
add_dependencies(TARGET_flexisip TARGET_bctoolbox TARGET_bellesip)
endif()
endif()
if(ENABLE_BC_ODBC)
linphone_builder_add_builder_to_target(TARGET_flexisip unixodbc)
linphone_builder_add_builder_to_target(TARGET_flexisip myodbc)
......@@ -253,7 +253,7 @@ else()
endif()
if(ENABLE_REDIS)
linphone_builder_add_builder_to_target(TARGET_flexisip hiredis)
endif()
endif()
linphone_builder_add_builder_to_target(TARGET_flexisip flexisip)
endif()
......
......@@ -29,7 +29,7 @@ set(EP_tunnel_GROUPABLE YES)
set(EP_tunnel_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
set(EP_tunnel_DEPENDENCIES )
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_tunnel_DEPENDENCIES EP_polarssl)
list(APPEND EP_tunnel_DEPENDENCIES EP_bctoolbox)
endif()
set(EP_tunnel_CMAKE_OPTIONS "-DENABLE_SERVERS=NO")
......@@ -93,10 +93,9 @@ CMAKE_FORCE_C_COMPILER(${IOS_TOOLCHAIN_CC} Clang)
CMAKE_FORCE_CXX_COMPILER(${IOS_TOOLCHAIN_CXX} Clang)
set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT} ${CMAKE_INSTALL_PREFIX})
# search for programs in the build host directories
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
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