diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index cd7ab5ea..eabf54fb 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -130,6 +130,7 @@ else() lib/${qt_lib_prefix}qtlibpng lib/${qt_lib_prefix}qtpcre2 ) + endif() set(qt_libs_list "") @@ -279,7 +280,30 @@ INTERFACE $ ) -if (LINUX) +if (WIN32) + if (build_win64) + set(libwebp_release_folder x64) + else() + set(libwebp_release_folder x86) + endif() + + set(webp_lib_loc ${libs_loc}/libwebp/out/$,debug,release>-static/${libwebp_release_folder}/lib) + + target_link_libraries(external_qt + INTERFACE + ${webp_lib_loc}/libwebp$<$:_debug>.lib + ${webp_lib_loc}/libwebpdemux$<$:_debug>.lib + ${webp_lib_loc}/libwebpmux$<$:_debug>.lib + ) +elseif (APPLE) + target_link_libraries(external_qt + INTERFACE + ${libs_loc}/local/lib/libwebp.a + ${libs_loc}/local/lib/libwebpdemux.a + ${libs_loc}/local/lib/libwebpmux.a + ${libs_loc}/local/lib/libsharpyuv.a + ) + elseif (LINUX) target_include_directories(external_qt SYSTEM INTERFACE ${qt_loc}/mkspecs/linux-g++ @@ -304,6 +328,10 @@ if (LINUX) xcb-util xcb-render-util xcb-keysyms + webpmux + webpdemux + webp + sharpyuv ) if (TARGET Qt::WaylandClient) target_link_optional_libraries(external_qt diff --git a/external/qt/package.cmake b/external/qt/package.cmake index cc2dfaa3..a4283f49 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -21,7 +21,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) set(qt_loc /usr/local/desktop-app/Qt-${qt_version}) endif() - set(CMAKE_PREFIX_PATH ${qt_loc}) + set(CMAKE_PREFIX_PATH ${qt_loc} ${libs_loc}/local) endif() if (NOT DEFINED QT_VERSION_MAJOR)