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

[Brandon Schaefer]

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

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

[Chris Halse Rogers (raof)]

Sure.

review: Approve

[Alan Griffiths (alan-griffiths)]

/sigh

review: Approve

[Alan Griffiths (alan-griffiths)]

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

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4276
https://mir-jenkins.ubuntu.com/job/mir-ci/3707/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5081/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5319
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5308
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5308
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5127/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5127/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5127/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5127/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3707/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1447/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5085/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1582/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5323
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5311
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5311
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5311

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

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

=== modified file 'src/capnproto/CMakeLists.txt'
--- src/capnproto/CMakeLists.txt	2017-07-28 17:00:43 +0000
+++ src/capnproto/CMakeLists.txt	2017-09-29 13:52:31 +0000
@@ -20,7 +20,13 @@
 capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
 
 add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
-target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
+
+# Upstream capnp 0.6.1 is using a different CMake file
+if (${CapnProto_VERSION} GREATER_EQUAL "0.6.1")
+    target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
+else()
+    target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
+endif()
 
 list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})