Skip to content

Commit e909a3a

Browse files
committed
Link system libwebp instead of Qt-s.
1 parent 2440fc9 commit e909a3a

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

external/qt/CMakeLists.txt

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ else()
130130
lib/${qt_lib_prefix}qtlibpng
131131
lib/${qt_lib_prefix}qtpcre2
132132
)
133+
133134
endif()
134135

135136
set(qt_libs_list "")
@@ -279,7 +280,30 @@ INTERFACE
279280
$<TARGET_FILE:desktop-app::external_zlib>
280281
)
281282

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)
283307
target_include_directories(external_qt SYSTEM
284308
INTERFACE
285309
${qt_loc}/mkspecs/linux-g++
@@ -304,6 +328,10 @@ if (LINUX)
304328
xcb-util
305329
xcb-render-util
306330
xcb-keysyms
331+
sharpyuv
332+
webpmux
333+
webpdemux
334+
webp
307335
)
308336
if (TARGET Qt::WaylandClient)
309337
target_link_optional_libraries(external_qt

external/qt/package.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
2121
set(qt_loc /usr/local/desktop-app/Qt-${qt_version})
2222
endif()
2323

24-
set(CMAKE_PREFIX_PATH ${qt_loc})
24+
set(CMAKE_PREFIX_PATH ${qt_loc} ${libs_loc}/local)
2525
endif()
2626

2727
if (NOT DEFINED QT_VERSION_MAJOR)

0 commit comments

Comments
 (0)