Merge tag 'upstream/1.1.0.1' into packaging/openkylin/yangtze

3rdparty/dsoftbus/CMakeLists.txt

@@ -3,26 +3,25 @@ set(CMAKE_CXX_STANDARD 17)
 project("dsoftbus")
 
 #set(CMAKE_OBJECT_PATH_MAX 500)
-set(DSOFTBUS_ROOT ${CMAKE_SOURCE_DIR}/dsoftbus/dsoftbus_build)
+set(DSOFTBUS_ROOT ${CMAKE_SOURCE_DIR}/3rdparty/dsoftbus/dsoftbus_build)
 set(dsoftbus_root_path "${DSOFTBUS_ROOT}/foundation/communication/dsoftbus")
 add_subdirectory(dsoftbus_build)
 
-
-add_executable(mobile_softbus_server server.cpp)
+add_executable(connectivity_softbus_server server.cpp)
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/output/bin)
 
 target_include_directories (
-        mobile_softbus_server
+        connectivity_softbus_server
         PRIVATE
         ${common_inc_dir}
         includes
         "${dsoftbus_root_path}/core/frame/common/include"
 )
 
-
+target_link_directories(connectivity_softbus_server PUBLIC /opt/kylin-connectivity/dsoftbus/)
 
 target_link_libraries (
-        mobile_softbus_server
+        connectivity_softbus_server
 
         softbus_server
         softbus_adapter

3rdparty/dsoftbus/dsoftbus_build/depend/ipc/CMakeLists.txt

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

3rdparty/dsoftbus/dsoftbus_build/foundation/communication/dsoftbus/adapter/CMakeLists.txt

@@ -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