Mir

Merge lp:~brandontschaefer/mir/improve-capnproto-cmake-find into lp:mir

Proposed by Brandon Schaefer on 2017-09-29
Status: Rejected
Rejected by: Brandon Schaefer on 2017-09-29
Proposed branch: lp:~brandontschaefer/mir/improve-capnproto-cmake-find
Merge into: lp:mir
Diff against target: 17 lines (+7/-1)
1 file modified
src/capnproto/CMakeLists.txt (+7/-1)
To merge this branch: bzr merge lp:~brandontschaefer/mir/improve-capnproto-cmake-find
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing on 2017-09-29
Alan Griffiths Approve on 2017-09-29
Chris Halse Rogers 2017-09-29 Approve on 2017-09-29
Review via email: mp+331565@code.launchpad.net

Commit message

Capnproto upstream uses a different cmake find file then 0.5.3 in universe now. Get ready for that change when ever it hits.

Description of the change

Capnproto upstream uses a different cmake find file then 0.5.3 in universe now. Get ready for that change when ever it hits.

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

Sure.

review: Approve
Alan Griffiths (alan-griffiths) wrote :

/sigh

review: Approve
Alan Griffiths (alan-griffiths) wrote :

Xenial bites!

15:42:37 CMake Error at src/capnproto/CMakeLists.txt:25 (if):
15:42:37 if given arguments:
15:42:37
15:42:37 "@CAPNP_VERSION@" "GREATER_EQUAL" "0.6.1"
15:42:37
15:42:37 Unknown arguments specified

Brandon Schaefer (brandontschaefer) wrote :

Right wont work on xenial. Meh this isnt needed until 0.6.1 is pushed. Rejected until we need this again.

Unmerged revisions

4276. By Brandon Schaefer on 2017-09-29

* Capnproto upstream uses a different cmake file then universe. Get ready for this change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/capnproto/CMakeLists.txt'
2--- src/capnproto/CMakeLists.txt 2017-07-28 17:00:43 +0000
3+++ src/capnproto/CMakeLists.txt 2017-09-29 13:52:31 +0000
4@@ -20,7 +20,13 @@
5 capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
6
7 add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
8-target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
9+
10+# Upstream capnp 0.6.1 is using a different CMake file
11+if (${CapnProto_VERSION} GREATER_EQUAL "0.6.1")
12+ target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
13+else()
14+ target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
15+endif()
16
17 list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
18

Subscribers

People subscribed via source and target branches