Merge branch 'upstream' into openkylin/yangtze
This commit is contained in:
commit
dcce508905
|
@ -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
|
||||
|
|
|
@ -18,6 +18,7 @@ add_library(
|
|||
SHARED
|
||||
${SOURCES}
|
||||
)
|
||||
target_link_directories(ipc_single PUBLIC /opt/kylin-connectivity/dsoftbus/)
|
||||
|
||||
target_link_libraries(
|
||||
ipc_single
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,6 +25,7 @@ add_library(
|
|||
${SOURCES}
|
||||
)
|
||||
|
||||
target_link_directories(liteipc_adapter PUBLIC /opt/kylin-connectivity/dsoftbus/)
|
||||
target_link_libraries(
|
||||
liteipc_adapter
|
||||
libsec_shared
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue