Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
bbc896c7
Commit
bbc896c7
authored
Mar 15, 2016
by
Ghislain MARY
Browse files
Do not build sqlite3, xml2 and zlib on Mac OS X, they are provided by the system.
parent
35dcb094
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
builders/CMakeLists.txt
builders/CMakeLists.txt
+5
-5
builders/bzrtp.cmake
builders/bzrtp.cmake
+2
-2
builders/linphone.cmake
builders/linphone.cmake
+2
-2
No files found.
builders/CMakeLists.txt
View file @
bbc896c7
...
...
@@ -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
I
OS, it is provided by the system
if
(
NOT
APPLE
)
# Do not build xml2 on
Apple systems (Mac OS X and i
OS
)
, 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
I
OS, they are provided by the system
if
(
NOT
APPLE
)
# Do not build sqlite3, xml2 and zlib on
Apple systems (Mac OS X and i
OS
)
, 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
)
...
...
builders/bzrtp.cmake
View file @
bbc896c7
...
...
@@ -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
I
OS, 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 i
OS
)
, it is provided by the system
list
(
APPEND EP_bzrtp_DEPENDENCIES EP_xml2
)
endif
()
if
(
MSVC
)
...
...
builders/linphone.cmake
View file @
bbc896c7
...
...
@@ -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
I
OS, 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 i
OS
)
, 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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment