File tree Expand file tree Collapse file tree 2 files changed +30
-2
lines changed Expand file tree Collapse file tree 2 files changed +30
-2
lines changed Original file line number Diff line number Diff line change @@ -130,6 +130,7 @@ else()
130
130
lib/${qt_lib_prefix}qtlibpng
131
131
lib/${qt_lib_prefix}qtpcre2
132
132
)
133
+
133
134
endif ()
134
135
135
136
set (qt_libs_list "" )
@@ -279,7 +280,30 @@ INTERFACE
279
280
$< TARGET_FILE:desktop-app::external_zlib>
280
281
)
281
282
282
- if (LINUX )
283
+ if (WIN32 )
284
+ if (build_win64 )
285
+ set (libwebp_release_folder x64 )
286
+ else ()
287
+ set (libwebp_release_folder x86 )
288
+ endif ()
289
+
290
+ set (webp_lib_loc ${libs_loc} /libwebp/out/$<IF:$<CONFIG:Debug>,debug,release>-static/${libwebp_release_folder}/lib )
291
+
292
+ target_link_libraries (external_qt
293
+ INTERFACE
294
+ ${webp_lib_loc} /libwebp$<$<CONFIG:Debug>:_debug>.lib
295
+ ${webp_lib_loc} /libwebpdemux$<$<CONFIG:Debug>:_debug>.lib
296
+ ${webp_lib_loc} /libwebpmux$<$<CONFIG:Debug>:_debug>.lib
297
+ )
298
+ elseif (APPLE )
299
+ target_link_libraries (external_qt
300
+ INTERFACE
301
+ ${libs_loc} /local/lib/libwebp.a
302
+ ${libs_loc} /local/lib/libwebpdemux.a
303
+ ${libs_loc} /local/lib/libwebpmux.a
304
+ ${libs_loc} /local/lib/libsharpyuv.a
305
+ )
306
+ elseif (LINUX )
283
307
target_include_directories (external_qt SYSTEM
284
308
INTERFACE
285
309
${qt_loc} /mkspecs/linux-g++
@@ -304,6 +328,10 @@ if (LINUX)
304
328
xcb-util
305
329
xcb-render-util
306
330
xcb-keysyms
331
+ sharpyuv
332
+ webpmux
333
+ webpdemux
334
+ webp
307
335
)
308
336
if (TARGET Qt::WaylandClient )
309
337
target_link_optional_libraries (external_qt
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
21
21
set (qt_loc /usr/local/desktop-app/Qt-${qt_version} )
22
22
endif ()
23
23
24
- set (CMAKE_PREFIX_PATH ${qt_loc} )
24
+ set (CMAKE_PREFIX_PATH ${qt_loc} ${libs_loc} /local )
25
25
endif ()
26
26
27
27
if (NOT DEFINED QT_VERSION_MAJOR )
You can’t perform that action at this time.
0 commit comments