Commit bbc896c7 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Do not build sqlite3, xml2 and zlib on Mac OS X, they are provided by the system.

parent 35dcb094
......@@ -91,7 +91,7 @@ else()
if( NOT DISABLE_BC_ANTLR)
linphone_builder_add_builder_to_target(TARGET_bellesip antlr3c)
endif()
if(NOT ANDROID AND NOT IOS AND NOT QNX)
if(NOT ANDROID AND NOT APPLE AND NOT QNX)
linphone_builder_add_builder_to_target(TARGET_bellesip zlib)
endif()
endif()
......@@ -149,8 +149,8 @@ else()
linphone_builder_add_builder_to_target(TARGET_ms2 srtp)
endif()
if(ENABLE_ZRTP)
if(NOT IOS)
# Do not build xml2 on IOS, it is provided by the system
if(NOT APPLE)
# Do not build xml2 on Apple systems (Mac OS X and iOS), it is provided by the system
linphone_builder_add_builder_to_target(TARGET_ms2 xml2)
endif()
endif()
......@@ -218,8 +218,8 @@ else()
add_dependencies(TARGET_linphone_builder TARGET_linphone)
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
if(NOT APPLE)
# Do not build sqlite3, xml2 and zlib on Apple systems (Mac OS X and iOS), they are provided by the system
linphone_builder_add_builder_to_target(TARGET_linphone sqlite3)
linphone_builder_add_builder_to_target(TARGET_linphone xml2)
if(NOT ANDROID AND NOT QNX)
......
......@@ -28,8 +28,8 @@ set(EP_bzrtp_GROUPABLE YES)
set(EP_bzrtp_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
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
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE)
# Do not build xml2 on Apple systems (Mac OS X and iOS), it is provided by the system
list(APPEND EP_bzrtp_DEPENDENCIES EP_xml2)
endif()
if(MSVC)
......
......@@ -28,8 +28,8 @@ set(EP_linphone_GROUPABLE YES)
set(EP_linphone_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
set(EP_linphone_DEPENDENCIES EP_bctoolbox EP_bellesip EP_ortp EP_ms2)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT IOS)
# Do not build sqlite3, xml2 and zlib on IOS, they are provided by the system
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE)
# Do not build sqlite3, xml2 and zlib on Apple systems (Mac OS X and iOS), they are provided by the system
list(APPEND EP_linphone_DEPENDENCIES EP_sqlite3 EP_xml2)
if (NOT QNX)
list(APPEND EP_linphone_DEPENDENCIES EP_zlib)
......
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