Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
belle-sip
Commits
beab264a
Commit
beab264a
authored
5 years ago
by
DanmeiChen
Browse files
Options
Download
Patches
Plain Diff
Feature/make bellesip framework
parent
f4770fdb
master
feature/add_server_groupchat_tester
feature/address-refactoring
feature/allow_ipv6_dns_servers_to_be_disabled
feature/bearer_auth
feature/conference_dialout
feature/crypto++
feature/improve_logs
feature/linphone-vcard-contacts-list-provisioning
feature/more_iterates
feature/pre_refresh_listener
feature/refactor-event
feature/sdp-belr
feature/swift_push_unit_tests
feature/to_string
feature/uwp_nuget
feature/video_image_resize
feature/yocto-kirkstone
fix/add_debug_logs
fix/audio-unit-callkit-master
fix/auth_info_replacement
fix/check-tests
fix/contact-handling
fix/dns-ttl
fix/http_provider_memory_leak
fix/ios_build_add_libbelle-sip-tester_framework
fix/prack
fix/prack_auth
fix/prack_retransmision_2
fix/pre_mbe_dtls3.6.1_with_belle_sip_loop_fix
fix/retry_after
fix/small_bug_fixes
fix/undesired-behaviours
fix/update-check
fix/user_agent_grammar
fix/video_conf_with_new_proto_packaging
fix/warnings_treated_as_error_arch
hotfix/gh_issues_templates_syntax_error
release/4.3
release/4.4
release/4.5
release/5.0
release/5.1
release/5.2
release/5.3
release/5.4
test/dummy_change_to_trigger_tester_launch
5.5.0-alpha
5.4.0
5.4.0-beta
5.4.0-alpha
5.3.106
5.3.105
5.3.104
5.3.102
5.3.101
5.3.100
5.3.99
5.3.97
5.3.96
5.3.95
5.3.94
5.3.93
5.3.92
5.3.90
5.3.89
5.3.88
5.3.87
5.3.86
5.3.85
5.3.84
5.3.83
5.3.81
5.3.79
5.3.77
5.3.74
5.3.73
5.3.72
5.3.71
5.3.70
5.3.69
5.3.67
5.3.65
5.3.64
5.3.63
5.3.62
5.3.61
5.3.60
5.3.59
5.3.58
5.3.57
5.3.56
5.3.55
5.3.54
5.3.53
5.3.52
5.3.51
5.3.50
5.3.49
5.3.46
5.3.45
5.3.44
5.3.42
5.3.41
5.3.38
5.3.37
5.3.36
5.3.35
5.3.34
5.3.33
5.3.29
5.3.27
5.3.26
5.3.25
5.3.24
5.3.23
5.3.22
5.3.21
5.3.19
5.3.18
5.3.15
5.3.13
5.3.12
5.3.11
5.3.10
5.3.7
5.3.6
5.3.5
5.3.4
5.3.3
5.3.1
5.3.0
5.3.0-beta
5.3.0-alpha
5.2.114
5.2.113
5.2.112
5.2.111
5.2.109
5.2.108
5.2.107
5.2.106
5.2.105
5.2.102
5.2.100
5.2.98
5.2.97
5.2.95
5.2.94
5.2.93
5.2.91
5.2.89
5.2.86
5.2.85
5.2.83
5.2.78
5.2.73
5.2.71
5.2.70
5.2.64
5.2.63
5.2.58
5.2.57
5.2.54
5.2.53
5.2.52
5.2.51
5.2.49
5.2.45
5.2.42
5.2.37
5.2.32
5.2.30
5.2.29
5.2.28
5.2.27
5.2.26
5.2.25
5.2.23
5.2.22
5.2.21
5.2.16
5.2.12
5.2.11
5.2.9
5.2.6
5.2.5
5.2.4
5.2.2
5.2.0
5.2.0-alpha
5.1.72
5.1.71
5.1.67
5.1.66
5.1.64
5.1.61
5.1.60
5.1.58
5.1.55
5.1.51
5.1.47
5.1.45
5.1.44
5.1.32
5.1.31
5.1.12
5.1.10
5.1.3
5.1.2
5.1.0
5.1.0-beta
5.1.0-alpha
5.0.71
5.0.70
5.0.68
5.0.67
5.0.66
5.0.63
5.0.62
5.0.61
5.0.58
5.0.55
5.0.53
5.0.51
5.0.50
5.0.49
5.0.46
5.0.44
5.0.37
5.0.36
5.0.32
5.0.28
5.0.27
5.0.26
5.0.24
5.0.23
5.0.22
5.0.20
5.0.18
5.0.16
5.0.15
5.0.13
5.0.12
5.0.11
5.0.8
5.0.5
5.0.3
5.0.0
5.0.0-beta
5.0.0-alpha
4.5.22
4.5.20
4.5.15
4.5.14
4.5.13
4.5.12
4.5.10
4.5.7
4.5.3
4.5.1
4.5.0
4.5.0-alpha
4.4.34
4.4.33
4.4.32
4.4.31
4.4.29
4.4.28
4.4.27
4.4.26
4.4.25
4.4.24
4.4.22
4.4.21
4.4.19
4.4.18
4.4.17
4.4.16
4.4.13
4.4.12
4.4.10
4.4.9
4.4.8
4.4.7
4.4.6
4.4.5
4.4.4
4.4.2
4.4.0
4.4.0-beta
4.4.0-alpha
4.3.2
4.3.1
4.3.0
4.3.0-beta
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/osx/Info.plist.in
+43
-0
build/osx/Info.plist.in
src/CMakeLists.txt
+31
-6
src/CMakeLists.txt
with
74 additions
and
6 deletions
build/osx/Info.plist.in
0 → 100644
+
43
−
0
View file @
beab264a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist
version=
"1.0"
>
<dict>
<key>
CFBundleDevelopmentRegion
</key>
<string>
English
</string>
<key>
CFBundleExecutable
</key>
<string>
${MACOSX_FRAMEWORK_NAME}
</string>
<key>
CFBundleGetInfoString
</key>
<string>
${MACOSX_BUNDLE_INFO_STRING}
</string>
<key>
CFBundleIconFile
</key>
<string>
${MACOSX_BUNDLE_ICON_FILE}
</string>
<key>
CFBundleIdentifier
</key>
<string>
${MACOSX_FRAMEWORK_IDENTIFIER}
</string>
<key>
LSMinimumSystemVersion
</key>
<string>
${MIN_OS}
</string>
<key>
MinimumOSVersion
</key>
<string>
${MIN_OS}
</string>
<key>
CFBundleInfoDictionaryVersion
</key>
<string>
6.0
</string>
<key>
CFBundleLongVersionString
</key>
<string>
${MACOSX_BUNDLE_LONG_VERSION_STRING}
</string>
<key>
CFBundleName
</key>
<string>
${MACOSX_BUNDLE_BUNDLE_NAME}
</string>
<key>
CFBundlePackageType
</key>
<string>
FMWK
</string>
<key>
CFBundleShortVersionString
</key>
<string>
${BELLE_SIP_VERSION}
</string>
<key>
CFBundleSignature
</key>
<string>
????
</string>
<key>
CFBundleVersion
</key>
<string>
${BELLE_SIP_VERSION}
</string>
<key>
CSResourcesFileMapped
</key>
<true/>
<key>
NSHumanReadableCopyright
</key>
<string>
${MACOSX_BUNDLE_COPYRIGHT}
</string>
<key>
NSPrincipalClass
</key>
<string>
NSApplication
</string>
<key>
NSHighResolutionCapable
</key>
<string>
True
</string>
</dict>
</plist>
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
31
−
6
View file @
beab264a
...
...
@@ -221,6 +221,20 @@ if(ENABLE_SHARED)
set_target_properties
(
bellesip PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON
)
target_include_directories
(
bellesip PUBLIC
${
PUBLIC_INCLUDE_DIRS
}
PRIVATE
${
PRIVATE_INCLUDE_DIRS
}
)
target_link_libraries
(
bellesip PRIVATE
${
LIBS
}
)
if
(
APPLE
)
if
(
IOS
)
set
(
MIN_OS
${
LINPHONE_IOS_DEPLOYMENT_TARGET
}
)
else
()
set
(
MIN_OS
${
CMAKE_OSX_DEPLOYMENT_TARGET
}
)
endif
()
set_target_properties
(
bellesip PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.belle-sip
MACOSX_FRAMEWORK_INFO_PLIST
"
${
CMAKE_SOURCE_DIR
}
/build/osx/Info.plist.in"
PUBLIC_HEADER
"
${
BELLE_SIP_HEADER_FILES
}
"
)
SET_TARGET_PROPERTIES
(
bellesip PROPERTIES OUTPUT_NAME belle-sip
)
endif
()
if
(
NOT
"
${
LINK_FLAGS_STR
}
"
STREQUAL
""
)
set_target_properties
(
bellesip PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS_STR
}
"
)
endif
()
...
...
@@ -232,13 +246,24 @@ if(ENABLE_SHARED)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif
()
endif
()
if
(
APPLE
)
install
(
TARGETS bellesip EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
FRAMEWORK DESTINATION Frameworks
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
else
()
install
(
TARGETS bellesip EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif
()
install
(
TARGETS bellesip EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif
()
#to avoid // build to generate code twice in // leading compilation issues. Might probably be done in a better way
if
(
ENABLE_SHARED AND ENABLE_STATIC
)
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets