kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Use LINK_ONLY instead of TARGET_FILE

Browse source
This commit is contained in:
Ilya Fedin 2022-01-28 23:14:40 +04:00 • committed by John Preston
parent 61f68138a8
commit df426419c7
6 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/ffmpeg/CMakeLists.txt vendored
View file

@ -39,8 +39,8 @@ else()
${ffmpeg_lib_loc}/libswresample/libswresample.a ${ffmpeg_lib_loc}/libswresample/libswresample.a
${ffmpeg_lib_loc}/libswscale/libswscale.a ${ffmpeg_lib_loc}/libswscale/libswscale.a
${ffmpeg_lib_loc}/libavutil/libavutil.a ${ffmpeg_lib_loc}/libavutil/libavutil.a
$<TARGET_FILE:desktop-app::external_opus> $<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_vpx> $<LINK_ONLY:desktop-app::external_vpx>
) )
if (APPLE) if (APPLE)
target_link_libraries(external_ffmpeg INTERFACE bz2) target_link_libraries(external_ffmpeg INTERFACE bz2)

3
external/kwayland/CMakeLists.txt vendored
View file

@ -130,8 +130,7 @@ if (DESKTOP_APP_USE_PACKAGED)
else() else()
target_link_libraries(external_kwayland_bundled target_link_libraries(external_kwayland_bundled
INTERFACE INTERFACE
desktop-app::linux_wayland_helper $<LINK_ONLY:desktop-app::linux_wayland_helper>
$<TARGET_FILE:desktop-app::linux_wayland_helper>
) )
endif() endif()

15
external/qt/CMakeLists.txt vendored
View file

@ -258,12 +258,9 @@ endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
${qt_libs_list} ${qt_libs_list}
desktop-app::external_openssl $<LINK_ONLY:desktop-app::external_openssl>
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_openssl_crypto> $<LINK_ONLY:desktop-app::external_zlib>
desktop-app::external_jpeg
desktop-app::external_zlib
$<TARGET_FILE:desktop-app::external_zlib>
) )
if (LINUX) if (LINUX)
@ -296,14 +293,12 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_wayland_helper $<LINK_ONLY:desktop-app::linux_wayland_helper>
$<TARGET_FILE:desktop-app::linux_wayland_helper>
) )
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_xcb_helper $<LINK_ONLY:desktop-app::linux_xcb_helper>
$<TARGET_FILE:desktop-app::linux_xcb_helper>
fontconfig fontconfig
freetype freetype
xcb xcb

15
external/qt/qt6/CMakeLists.txt vendored
View file

@ -234,12 +234,9 @@ list(APPEND qt_libs_list
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
${qt_libs_list} ${qt_libs_list}
desktop-app::external_openssl $<LINK_ONLY:desktop-app::external_openssl>
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_openssl_crypto> $<LINK_ONLY:desktop-app::external_zlib>
desktop-app::external_jpeg
desktop-app::external_zlib
$<TARGET_FILE:desktop-app::external_zlib>
) )
if (LINUX) if (LINUX)
@ -271,14 +268,12 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_wayland_helper $<LINK_ONLY:desktop-app::linux_wayland_helper>
$<TARGET_FILE:desktop-app::linux_wayland_helper>
) )
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
desktop-app::linux_xcb_helper $<LINK_ONLY:desktop-app::linux_xcb_helper>
$<TARGET_FILE:desktop-app::linux_xcb_helper>
fontconfig fontconfig
freetype freetype
xcb xcb

8
external/webrtc/CMakeLists.txt vendored
View file

@ -87,10 +87,10 @@ endforeach()
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE
${webrtc_libs_list} ${webrtc_libs_list}
desktop-app::external_openssl $<LINK_ONLY:desktop-app::external_openssl>
desktop-app::external_jpeg $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_opus> $<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_vpx> $<LINK_ONLY:desktop-app::external_vpx>
) )
if (WIN32) if (WIN32)

3
options_linux.cmake
View file

@ -86,8 +86,7 @@ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
) )
target_link_libraries(common_options target_link_libraries(common_options
INTERFACE INTERFACE
desktop-app::linux_allocation_tracer $<LINK_ONLY:desktop-app::linux_allocation_tracer>
$<TARGET_FILE:desktop-app::linux_allocation_tracer>
) )
endif() endif()