Skip to content

Commit c5b1f9c

Browse files
pppanghu77re2zero
authored andcommitted
fix: [build] fix build
[build] fix build Log: [build] fix build Task: https://pms.uniontech.com/task-view-354339.html
1 parent 564d609 commit c5b1f9c

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.github/workflows/windows-mingw.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,14 @@ jobs:
9494
cmake.exe ../source/
9595
9696
- name: Inno Setup data-transfer
97-
uses: Minionguyjpro/[email protected]
97+
uses: nadeemjazmawe/[email protected]
9898
with:
99-
path: build/deepin-data-transfer-setup.iss
100-
options: /O+
99+
filepath: build/deepin-data-transfer-setup.iss
101100

102101
- name: Inno Setup cooperation
103-
uses: Minionguyjpro/[email protected]
102+
uses: nadeemjazmawe/[email protected]
104103
with:
105-
path: build/dde-cooperation-setup.iss
106-
options: /O+
104+
filepath: build/dde-cooperation-setup.iss
107105

108106
- name: Create Release
109107
uses: softprops/action-gh-release@v1

3rdparty/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(BUILD_WITH_SYSTEMD ON CACHE BOOL "Build with systemd")
2525
add_subdirectory(coost)
2626

2727
add_subdirectory(zrpc)
28-
add_subdirectory(QtZeroConf)
2928

3029

3130
if (CMAKE_SYSTEM MATCHES "Windows")
@@ -50,6 +49,7 @@ message(" >> include barrier...")
5049
# barrier v2.4.0 release, upstream: https://github.com/debauchee/barrier
5150
if (UNIX)
5251
add_subdirectory(barrier)
52+
add_subdirectory(QtZeroConf)
5353
else()
5454
# 拷贝编译好的版本windows版本
5555
file(GLOB BARRIER_BINS ${CMAKE_CURRENT_SOURCE_DIR}/barrier/bins/*)

src/plugins/cooperation/core/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ FILE(GLOB PLUGIN_FILES
3737
"${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp"
3838
"${CMAKE_CURRENT_SOURCE_DIR}/maincontroller/*.h"
3939
"${CMAKE_CURRENT_SOURCE_DIR}/maincontroller/*.cpp"
40-
"${CMAKE_CURRENT_SOURCE_DIR}/discover/*.h"
41-
"${CMAKE_CURRENT_SOURCE_DIR}/discover/*.cpp"
4240
"${CMAKE_CURRENT_SOURCE_DIR}/*.json"
4341
)
4442

@@ -62,6 +60,8 @@ elseif (CMAKE_SYSTEM MATCHES "Linux")
6260
"${CMAKE_SOURCE_DIR}/src/configs/dconfig/*.cpp"
6361
"${CMAKE_CURRENT_SOURCE_DIR}/gui/linux/*.h"
6462
"${CMAKE_CURRENT_SOURCE_DIR}/gui/linux/*.cpp"
63+
"${CMAKE_CURRENT_SOURCE_DIR}/discover/*.h"
64+
"${CMAKE_CURRENT_SOURCE_DIR}/discover/*.cpp"
6565
"${CMAKE_CURRENT_SOURCE_DIR}/maincontroller/linux/*.cpp"
6666
)
6767
find_package(Dtk COMPONENTS Widget REQUIRED)
@@ -97,13 +97,13 @@ target_link_libraries(${PROJECT_NAME}
9797
Qt${QT_VERSION_MAJOR}::Widgets
9898
Qt${QT_VERSION_MAJOR}::Network
9999
co
100-
QtZeroConf
101100
)
102101

103102
# 平台相关的库,添加到这里
104103
if (CMAKE_SYSTEM MATCHES "Linux")
105104
target_link_libraries(${PROJECT_NAME}
106105
${DtkWidget_LIBRARIES}
106+
QtZeroConf
107107
)
108108
endif()
109109
if (CMAKE_SYSTEM MATCHES "Windows")

0 commit comments

Comments
 (0)