← Back to team overview

deja-dup-team team mailing list archive

[Merge] lp:~jlec/deja-dup/deja-dup into lp:deja-dup

 

Justin has proposed merging lp:~jlec/deja-dup/deja-dup into lp:deja-dup.

Requested reviews:
  Déjà Dup Developers (deja-dup-hackers)
Related bugs:
  Bug #1274845 in Déjà Dup: "fails to build with cmake-2.8.12"
  https://bugs.launchpad.net/deja-dup/+bug/1274845

For more details, see:
https://code.launchpad.net/~jlec/deja-dup/deja-dup/+merge/204168

Fixes https://bugs.launchpad.net/deja-dup/+bug/1274845
-- 
https://code.launchpad.net/~jlec/deja-dup/deja-dup/+merge/204168
Your team Déjà Dup Developers is requested to review the proposed merge of lp:~jlec/deja-dup/deja-dup into lp:deja-dup.
=== modified file 'deja-dup/widgets/CMakeLists.txt'
--- deja-dup/widgets/CMakeLists.txt	2014-01-23 20:35:12 +0000
+++ deja-dup/widgets/CMakeLists.txt	2014-01-31 08:47:22 +0000
@@ -52,7 +52,7 @@
                 GENERATE_VAPI widgets
                 GENERATE_HEADER widgets)
 add_library(widgets SHARED ${VALA_C})
-target_link_libraries(widgets deja "${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS}")
+target_link_libraries(widgets deja ${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS})
 set_target_properties(widgets PROPERTIES
                       INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja;${CMAKE_SOURCE_DIR}/libdeja"
                       COMPILE_FLAGS "${GTK_CFLAGS} ${NOTIFY_CFLAGS} ${PEAS_CFLAGS} ${SECRET_CFLAGS} ${UNITY_CFLAGS} ${COMMON_CFLAGS}")


Follow ups