| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From b8dc608dad7d9fc3a4c16acd0327d97b81c23b95 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 15 Nov 2016 01:32:31 +0000 |
| 4 | Subject: [PATCH] apps/CMakeLists.txt: Explicitly link libbfb and libmulticobex |
| 5 | |
| 6 | Transitive linking is disabled now for multicobex and |
| 7 | obexftp, This ends up with linking errors for apps, therefore |
| 8 | they are required to be added to link line explicitly. |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | apps/CMakeLists.txt | 13 +++++++++++-- |
| 13 | 1 file changed, 11 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | Index: obexftp-0.24.2-Source/apps/CMakeLists.txt |
| 16 | =================================================================== |
| 17 | --- obexftp-0.24.2-Source.orig/apps/CMakeLists.txt |
| 18 | +++ obexftp-0.24.2-Source/apps/CMakeLists.txt |
| 19 | @@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VE |
| 20 | add_definitions ( -DHAVE_USB ) |
| 21 | |
| 22 | add_executable ( obexftp_app obexftp.c ) |
| 23 | -target_link_libraries ( obexftp_app obexftp ) |
| 24 | +target_link_libraries ( obexftp_app |
| 25 | + PRIVATE multicobex |
| 26 | + PRIVATE bfb |
| 27 | + obexftp |
| 28 | +) |
| 29 | set_target_properties ( obexftp_app PROPERTIES |
| 30 | OUTPUT_NAME obexftp |
| 31 | ) |
| 32 | |
| 33 | |
| 34 | add_executable ( obexftpd_app obexftpd.c ) |
| 35 | -target_link_libraries ( obexftpd_app obexftp openobex ) |
| 36 | +target_link_libraries ( obexftpd_app |
| 37 | + PRIVATE multicobex |
| 38 | + PRIVATE bfb |
| 39 | + obexftp |
| 40 | + openobex |
| 41 | +) |
| 42 | set_target_properties ( obexftpd_app PROPERTIES |
| 43 | OUTPUT_NAME obexftpd |
| 44 | ) |
| 45 | Index: obexftp-0.24.2-Source/fuse/CMakeLists.txt |
| 46 | =================================================================== |
| 47 | --- obexftp-0.24.2-Source.orig/fuse/CMakeLists.txt |
| 48 | +++ obexftp-0.24.2-Source/fuse/CMakeLists.txt |
| 49 | @@ -13,6 +13,8 @@ if ( Fuse_FOUND ) |
| 50 | ) |
| 51 | |
| 52 | target_link_libraries ( obexfs |
| 53 | + PRIVATE multicobex |
| 54 | + PRIVATE bfb |
| 55 | obexftp |
| 56 | ${Fuse_LIBRARIES} |
| 57 | ${EXPAT_LIBRARIES} |
| 58 | @@ -23,6 +25,8 @@ if ( Fuse_FOUND ) |
| 59 | ) |
| 60 | |
| 61 | target_link_libraries ( obexautofs |
| 62 | + PRIVATE multicobex |
| 63 | + PRIVATE bfb |
| 64 | obexftp |
| 65 | ${Fuse_LIBRARIES} |
| 66 | ) |