Photos

Merge lp:~tintou/pantheon-photos/racing-compilation into lp:~pantheon-photos/pantheon-photos/trunk

  1. racing-compilation
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Approved by: Cody Garver
Approved revision: 2882
Merged at revision: 2882
Proposed branch: lp:~tintou/pantheon-photos/racing-compilation
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 71 lines (+4/-5)
5 files modified
CMakeLists.txt (+0/-1)
plugins/pantheon-photos-publishing-extras/CMakeLists.txt (+1/-1)
plugins/pantheon-photos-publishing/CMakeLists.txt (+1/-1)
plugins/pantheon-photos-transitions/CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~tintou/pantheon-photos/racing-compilation
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+282677@code.launchpad.net

Commit message

Depend on the "fake" pantheon-photos library before starting other compilations

Description of the change

We need to depend on the "fake" pantheon-photos library before starting other compilations.

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 'CMakeLists.txt'
2--- CMakeLists.txt 2016-01-14 13:28:25 +0000
3+++ CMakeLists.txt 2016-01-14 22:07:46 +0000
4@@ -72,7 +72,6 @@
5
6 set (GLOBAL_VALA_OPTIONS
7 --vapidir=${CMAKE_SOURCE_DIR}/vapi
8- --vapidir=${CMAKE_BINARY_DIR}/src
9 --target-glib=2.32
10 --thread
11 # Remove it when vala bindings are no more experimental (see https://bugzilla.gnome.org/show_bug.cgi?id=719597)
12
13=== modified file 'plugins/pantheon-photos-publishing-extras/CMakeLists.txt'
14--- plugins/pantheon-photos-publishing-extras/CMakeLists.txt 2016-01-14 14:01:47 +0000
15+++ plugins/pantheon-photos-publishing-extras/CMakeLists.txt 2016-01-14 22:07:46 +0000
16@@ -8,9 +8,9 @@
17 RESTSupport.vala
18 CUSTOM_VAPIS
19 ${CMAKE_SOURCE_DIR}/vapi/config.vapi
20+ ${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}.vapi
21 PACKAGES
22 ${DEPS_PACKAGES}
23- ${CMAKE_PROJECT_NAME}
24 OPTIONS
25 ${GLOBAL_VALA_OPTIONS}
26 )
27
28=== modified file 'plugins/pantheon-photos-publishing/CMakeLists.txt'
29--- plugins/pantheon-photos-publishing/CMakeLists.txt 2016-01-14 14:01:47 +0000
30+++ plugins/pantheon-photos-publishing/CMakeLists.txt 2016-01-14 22:07:46 +0000
31@@ -11,9 +11,9 @@
32 RESTSupport.vala
33 CUSTOM_VAPIS
34 ${CMAKE_SOURCE_DIR}/vapi/config.vapi
35+ ${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}.vapi
36 PACKAGES
37 ${DEPS_PACKAGES}
38- ${CMAKE_PROJECT_NAME}
39 OPTIONS
40 ${GLOBAL_VALA_OPTIONS}
41 )
42
43=== modified file 'plugins/pantheon-photos-transitions/CMakeLists.txt'
44--- plugins/pantheon-photos-transitions/CMakeLists.txt 2016-01-14 14:01:47 +0000
45+++ plugins/pantheon-photos-transitions/CMakeLists.txt 2016-01-14 22:07:46 +0000
46@@ -15,9 +15,9 @@
47 Resources.vala
48 CUSTOM_VAPIS
49 ${CMAKE_SOURCE_DIR}/vapi/config.vapi
50+ ${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}.vapi
51 PACKAGES
52 ${DEPS_PACKAGES}
53- ${CMAKE_PROJECT_NAME}
54 OPTIONS
55 ${GLOBAL_VALA_OPTIONS}
56 )
57
58=== modified file 'src/CMakeLists.txt'
59--- src/CMakeLists.txt 2016-01-14 12:35:35 +0000
60+++ src/CMakeLists.txt 2016-01-14 22:07:46 +0000
61@@ -206,9 +206,9 @@
62 util/Util.vala
63 CUSTOM_VAPIS
64 ${CMAKE_SOURCE_DIR}/vapi/config.vapi
65+ ${CMAKE_BINARY_DIR}/src/${CMAKE_PROJECT_NAME}.vapi
66 PACKAGES
67 ${DEPS_PACKAGES}
68- ${CMAKE_PROJECT_NAME}
69 OPTIONS
70 ${GLOBAL_VALA_OPTIONS}
71 )

Subscribers

People subscribed via source and target branches

to all changes: