Skip to content

Commit

Permalink
Restore TARGET_FILE usage for external libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@ilya-fedin @john-preston
ilya-fedin authored and john-preston committed Feb 5, 2022
1 parent 6d81711 commit 54e750c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions external/ffmpeg/CMakeLists.txt
View file
Expand Up @@ -40,7 +40,9 @@ else()
${ffmpeg_lib_loc}/libswscale/libswscale.a
${ffmpeg_lib_loc}/libavutil/libavutil.a
$<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_opus>
$<LINK_ONLY:desktop-app::external_vpx>
$<TARGET_FILE:desktop-app::external_vpx>
)
if (APPLE)
target_link_libraries(external_ffmpeg INTERFACE bz2)
Expand Down
3 changes: 3 additions & 0 deletions external/qt/CMakeLists.txt
View file
Expand Up @@ -260,8 +260,11 @@ target_link_libraries(external_qt
INTERFACE
${qt_libs_list}
$<LINK_ONLY:desktop-app::external_openssl>
$<TARGET_FILE:desktop-app::external_openssl_ssl>
$<TARGET_FILE:desktop-app::external_openssl_crypto>
$<LINK_ONLY:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_zlib>
$<TARGET_FILE:desktop-app::external_zlib>
)

if (LINUX)
Expand Down
2 changes: 2 additions & 0 deletions external/qt/qt6/CMakeLists.txt
View file
Expand Up @@ -235,6 +235,8 @@ target_link_libraries(external_qt
INTERFACE
${qt_libs_list}
$<LINK_ONLY:desktop-app::external_openssl>
$<TARGET_FILE:desktop-app::external_openssl_ssl>
$<TARGET_FILE:desktop-app::external_openssl_crypto>
$<LINK_ONLY:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_zlib>
$<TARGET_FILE:desktop-app::external_zlib>
Expand Down
2 changes: 2 additions & 0 deletions external/webrtc/CMakeLists.txt
View file
Expand Up @@ -90,7 +90,9 @@ INTERFACE
$<LINK_ONLY:desktop-app::external_openssl>
$<LINK_ONLY:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_opus>
$<LINK_ONLY:desktop-app::external_vpx>
$<TARGET_FILE:desktop-app::external_vpx>
)

if (WIN32)
Expand Down

1 comment on commit 54e750c

@xuzhao9
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit breaks the build on openSUSE with the following error messages:
[ 9s] Error evaluating generator expression:
[ 9s]
[ 9s] $<TARGET_FILE:desktop-app::external_opus>
[ 9s]
[ 9s] Target "desktop-app::external_opus" is not an executable or library.
[ 9s]

Please sign in to comment.