Merge lp:~jlec/deja-dup/deja-dup into lp:deja-dup/30

Proposed by Justin
Status: Merged
Merged at revision: 1530
Proposed branch: lp:~jlec/deja-dup/deja-dup
Merge into: lp:deja-dup/30
Diff against target: 12 lines (+1/-1)
1 file modified
deja-dup/widgets/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~jlec/deja-dup/deja-dup
Reviewer Review Type Date Requested Status
Déjà Dup Developers Pending
Review via email: mp+204168@code.launchpad.net

Description of the change

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deja-dup/widgets/CMakeLists.txt'
2--- deja-dup/widgets/CMakeLists.txt 2014-01-23 20:35:12 +0000
3+++ deja-dup/widgets/CMakeLists.txt 2014-01-31 08:47:22 +0000
4@@ -52,7 +52,7 @@
5 GENERATE_VAPI widgets
6 GENERATE_HEADER widgets)
7 add_library(widgets SHARED ${VALA_C})
8-target_link_libraries(widgets deja "${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS}")
9+target_link_libraries(widgets deja ${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS})
10 set_target_properties(widgets PROPERTIES
11 INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja;${CMAKE_SOURCE_DIR}/libdeja"
12 COMPILE_FLAGS "${GTK_CFLAGS} ${NOTIFY_CFLAGS} ${PEAS_CFLAGS} ${SECRET_CFLAGS} ${UNITY_CFLAGS} ${COMMON_CFLAGS}")

Subscribers

People subscribed via source and target branches

to all changes: