Skip to content
GitLab
Commit b83808c7 authored by DanmeiChen's avatar DanmeiChen
Browse files

fix swift file is attached to multiple targets

parent ab4beb2a
tmp/workaround_missing_tester_log_message_bug fix/call_repair fix/chatroom_const_params fix/dtls_default_path fix/local-permission-detection fix/log_file_updates fix/magic_search_clone_crash fix/no_unregister_if_remote_push_allowed_5_0 fix/remote_media_changed_notify fix/rewrite-tone-manager release/5.0 5.0.71 5.0.70 5.0.69 5.0.68 5.0.67 5.0.66 5.0.65 5.0.64 5.0.63 5.0.62 5.0.61 5.0.60 5.0.59 5.0.58 5.0.57 5.0.56 5.0.55 5.0.53 5.0.52 5.0.51 5.0.50 5.0.49 5.0.47 5.0.46 5.0.45 5.0.44 5.0.43 5.0.42 5.0.41 5.0.40 5.0.39 5.0.38 5.0.37 5.0.36 5.0.35 5.0.34 5.0.32 5.0.31
1 merge request!1556fix swift file is attached to multiple targets
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1 deletion
wrappers/swift/CMakeLists.txt
+ 6
− 0
View file @ b83808c7
...@@ -73,6 +73,12 @@ if (ENABLE_JAZZY_DOC OR ENABLE_SWIFT_WRAPPER_COMPILATION) ...@@ -73,6 +73,12 @@ if (ENABLE_JAZZY_DOC OR ENABLE_SWIFT_WRAPPER_COMPILATION)
PRIVATE ${BCTOOLBOX_CORE_LIBRARIES} ${BELLESIP_LIBRARIES} linphone PRIVATE ${BCTOOLBOX_CORE_LIBRARIES} ${BELLESIP_LIBRARIES} linphone
) )
if (NOT ENABLE_SWIFT_WRAPPER_COMPILATION)
# LinphoneWrapper.swift is attached to multiple targets: linphonesw linphoneswsource
# but none of these is a common dependency of the other(s). This is not
# allowed by the Xcode "new build system".
add_dependencies(linphonesw linphoneswsource)
endif()
if(CMAKE_GENERATOR STREQUAL Xcode) if(CMAKE_GENERATOR STREQUAL Xcode)
set_target_properties(linphonesw PROPERTIES set_target_properties(linphonesw PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
......
wrappers/swift/JazzyDoc.cmake
+ 1
− 1
View file @ b83808c7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
if(ENABLE_SWIFT_WRAPPER AND ENABLE_JAZZY_DOC) if(ENABLE_SWIFT_WRAPPER AND ENABLE_JAZZY_DOC)
message("Generating jazzy doc for swift module, we need archs x86_64 to generate jazzy doc!") message("Generating jazzy doc for swift module, we need archs x86_64 to generate jazzy doc!")
execute_process( execute_process(
COMMAND "jazzy" "-x" "-project,linphone.xcodeproj,-scheme,linphonesw" "--readme" "README" COMMAND "jazzy" "-x" "-project,linphone.xcodeproj,-scheme,linphonesw" "--readme" "wrappers/swift/README"
WORKING_DIRECTORY "${LINPHONESDK_BUILD_DIR}/WORK/ios-x86_64/Build/linphone/" WORKING_DIRECTORY "${LINPHONESDK_BUILD_DIR}/WORK/ios-x86_64/Build/linphone/"
) )
execute_process( execute_process(
......
Supports Markdown
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