Mir

Merge lp:~vanvugt/mir/reduce-scope-of-3p-sources into lp:~mir-team/mir/trunk

  1. reduce-scope-of-3p-sources
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 496
Proposed branch: lp:~vanvugt/mir/reduce-scope-of-3p-sources
Merge into: lp:~mir-team/mir/trunk
Diff against target: 35 lines (+0/-3)
3 files modified
3rd_party/CMakeLists.txt (+0/-1)
CMakeLists.txt (+0/-1)
src/client/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/reduce-scope-of-3p-sources
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+153074@code.launchpad.net

Commit message

Don't export MIR_3RD_PARTY_SOURCES globally. It's not needed. Even where it
was being used in mirclient was unnecessary because mirclient already
links to 3rd_party.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:494
http://jenkins.qa.ubuntu.com/job/mir-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/68//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/67//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Yes. Was daft.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '3rd_party/CMakeLists.txt'
2--- 3rd_party/CMakeLists.txt 2013-03-07 08:04:05 +0000
3+++ 3rd_party/CMakeLists.txt 2013-03-13 07:55:23 +0000
4@@ -17,7 +17,6 @@
5 )
6
7 set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES} PARENT_SCOPE)
8-SET(MIR_3RD_PARTY_SOURCES ${MIR_3RD_PARTY_SOURCES} PARENT_SCOPE)
9 set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
10 PARENT_SCOPE)
11
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2013-03-13 07:41:46 +0000
15+++ CMakeLists.txt 2013-03-13 07:55:23 +0000
16@@ -155,7 +155,6 @@
17 set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input
18 set(MIR_ANDROID_INPUT_COMPILE_FLAGS) # to be filled by android-input
19 set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES)
20-set(MIR_3RD_PARTY_SOURCES)
21 add_subdirectory(3rd_party/)
22 include_directories(${MIR_3RD_PARTY_INCLUDE_DIRECTORIES})
23
24
25=== modified file 'src/client/CMakeLists.txt'
26--- src/client/CMakeLists.txt 2013-03-13 07:41:46 +0000
27+++ src/client/CMakeLists.txt 2013-03-13 07:55:23 +0000
28@@ -78,7 +78,6 @@
29 mirclient SHARED
30
31 ${CLIENT_SOURCES}
32- ${MIR_3RD_PARTY_SOURCES}
33 )
34
35 set_target_properties(

Subscribers

People subscribed via source and target branches