Merge branch 'upstream' into openkylin/yangtze

This commit is contained in:
huheng@kylinos.cn 2022-10-20 15:33:06 +08:00
commit dcce508905
51 changed files with 59 additions and 2 deletions

View File

@ -19,7 +19,7 @@ target_include_directories (
"${dsoftbus_root_path}/core/frame/common/include"
)
target_link_directories(mobile_softbus_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries (
mobile_softbus_server

View File

@ -18,6 +18,7 @@ add_library(
SHARED
${SOURCES}
)
target_link_directories(ipc_single PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
ipc_single

View File

@ -36,6 +36,8 @@ add_library(
# log
#)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_adapter PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_adapter
mbedtls_shared

View File

@ -31,6 +31,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(nstackx_ctrl PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
nstackx_ctrl
nstackx_util.open

View File

@ -41,6 +41,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(nstackx_util.open PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
nstackx_util.open
mbedtls_shared

View File

@ -39,6 +39,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_auth_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_auth_server
softbus_adapter

View File

@ -79,6 +79,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_server
softbus_adapter

View File

@ -34,6 +34,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_hub PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_hub
softbus_adapter

View File

@ -41,6 +41,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_ledger PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_ledger
softbus_adapter

View File

@ -35,6 +35,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_utils PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_utils
softbus_adapter

View File

@ -21,6 +21,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(json_utils PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
json_utils
softbus_log

View File

@ -24,6 +24,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_log PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_log
softbus_adapter

View File

@ -22,6 +22,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(message_handler PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
message_handler
softbus_adapter

View File

@ -21,6 +21,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_queue PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_queue
softbus_adapter

View File

@ -31,6 +31,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_permission PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_permission
json_utils

View File

@ -21,6 +21,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_seq_verification PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_seq_verification
libhilog

View File

@ -21,6 +21,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_property PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_property
softbus_adapter

View File

@ -20,6 +20,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_utils PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_utils
softbus_adapter

View File

@ -30,6 +30,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(ble_connection PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
ble_connection
libhilog

View File

@ -30,6 +30,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(br_connection PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
br_connection
libhilog

View File

@ -23,6 +23,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(conn_common PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
conn_common
softbus_adapter

View File

@ -25,6 +25,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(conn_manager PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
conn_manager
softbus_adapter

View File

@ -26,6 +26,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(tcp_connection PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
tcp_connection
softbus_adapter

View File

@ -37,6 +37,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_disc_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_disc_server
libhilog

View File

@ -32,6 +32,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(ble_discovery PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
ble_discovery
libhilog

View File

@ -31,6 +31,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_disc_coap PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_disc_coap
softbus_adapter

View File

@ -57,6 +57,9 @@ add_library(
SHARED
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_server_frame PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_server_frame

View File

@ -40,6 +40,9 @@ add_executable(mobile_softbus_client src/softbus_client_main.cpp)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/bin)
target_link_directories(softbus_client PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_directories(mobile_softbus_client PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(mobile_softbus_client PUBLIC softbus_client
)

View File

@ -45,6 +45,8 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_server
softbus_adapter

View File

@ -20,6 +20,8 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_server_data PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_server_data
libhilog

View File

@ -27,6 +27,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_common PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_common
libhilog

View File

@ -33,6 +33,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_ipc_proxy PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_ipc_proxy
libhilog

View File

@ -22,6 +22,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_trans_pending PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_trans_pending
libhilog

View File

@ -49,6 +49,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_session PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_session
libhilog

View File

@ -46,6 +46,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_proxy_channel PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_proxy_channel
json_utils

View File

@ -38,6 +38,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_direct_channel PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_direct_channel
softbus_utils

View File

@ -38,6 +38,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_udp_channel PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_udp_channel
softbus_utils

View File

@ -43,6 +43,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_manager_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_manager_sdk
softbus_adapter

View File

@ -36,6 +36,8 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_bus_center_service_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_bus_center_service_sdk
softbus_adapter

View File

@ -36,6 +36,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_disc_manager_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_disc_manager_sdk
libhilog

View File

@ -34,6 +34,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_disc_service_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_disc_service_sdk
softbus_adapter

View File

@ -43,6 +43,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(softbus_client_frame PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
softbus_client_frame
libhilog

View File

@ -43,6 +43,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_session_manager_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_session_manager_sdk
softbus_adapter

View File

@ -33,6 +33,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_ipc_proxy_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_ipc_proxy_sdk
libhilog

View File

@ -41,6 +41,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_session_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_session_sdk
json_utils

View File

@ -25,6 +25,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_auth_channel_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_auth_channel_sdk
softbus_log

View File

@ -27,6 +27,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_proxy_channel_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_proxy_channel_sdk
softbus_log

View File

@ -36,6 +36,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_direct_channel_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_direct_channel_sdk
softbus_seq_verification

View File

@ -29,6 +29,7 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(dsoftbus_trans_udp_channel_sdk PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
dsoftbus_trans_udp_channel_sdk
libhilog

View File

@ -25,6 +25,7 @@ add_library(
${SOURCES}
)
target_link_directories(liteipc_adapter PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(
liteipc_adapter
libsec_shared

View File

@ -15,5 +15,5 @@ add_library(
${SOURCES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/lib/dsoftbus)
target_link_directories(utils PUBLIC /opt/kylin-connectivity/dsoftbus/)
target_link_libraries(utils libsec_shared)