kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Deduplicate jpeg and zlib linking in qt

Browse source
This commit is contained in:
Ilya Fedin 2020-12-15 17:19:42 +04:00 • committed by John Preston
parent b5124ece3e
commit 29a45b899b
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
external/qt/CMakeLists.txt vendored
View file

@ -208,11 +208,6 @@ else()
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
endforeach() endforeach()
target_link_libraries(external_qt
INTERFACE
desktop-app::external_jpeg
desktop-app::external_zlib
)
elseif (APPLE) elseif (APPLE)
if (NOT build_osx) if (NOT build_osx)
set(qt_libs set(qt_libs
@ -246,8 +241,6 @@ else()
endforeach() endforeach()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::external_jpeg
desktop-app::external_zlib
cups cups
) )
else() else()
@ -313,6 +306,8 @@ else()
${qt_libs_list} ${qt_libs_list}
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<TARGET_FILE:desktop-app::external_openssl_ssl>
$<TARGET_FILE:desktop-app::external_openssl_crypto> $<TARGET_FILE:desktop-app::external_openssl_crypto>
desktop-app::external_jpeg
desktop-app::external_zlib
) )
if (LINUX) if (LINUX)
@ -378,8 +373,6 @@ else()
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::external_jpeg
desktop-app::external_zlib
ICE ICE
SM SM
fontconfig fontconfig