Mir

Merge lp:~kdub/mir/fix-1609916 into lp:mir

  1. fix-1609916
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3630
Proposed branch: lp:~kdub/mir/fix-1609916
Merge into: lp:mir
Diff against target: 54 lines (+9/-4)
3 files modified
src/platforms/common/server/CMakeLists.txt (+4/-1)
src/platforms/common/server/kms-utils/CMakeLists.txt (+5/-2)
tests/unit-tests/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~kdub/mir/fix-1609916
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+302083@code.launchpad.net

Commit message

fix "cmake .. -DMIR_PLATFORM=android" build.

fixes: LP: #1609916

Description of the change

fix "cmake .. -DMIR_PLATFORM=android" build.

fixes: LP: #1609916

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3630
https://mir-jenkins.ubuntu.com/job/mir-ci/1400/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1703
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1756
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1747
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1747
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1747
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1724/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1724/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1724/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1724/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1724/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1724
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1724/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yeah, looks like it will solve the bug.

Although for actual releases we'd always want it baked in.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/common/server/CMakeLists.txt'
2--- src/platforms/common/server/CMakeLists.txt 2016-05-26 02:12:27 +0000
3+++ src/platforms/common/server/CMakeLists.txt 2016-08-04 18:55:01 +0000
4@@ -1,4 +1,6 @@
5-add_subdirectory(kms-utils/)
6+if (MIR_BUILD_PLATFORM_MESA_KMS OR MIR_BUILD_PLATFORM_MESA_X11 OR MIR_BUILD_PLATFORM_EGLSTREAM_KMS)
7+ add_subdirectory(kms-utils/)
8+endif()
9
10 include_directories(
11 ${server_common_include_dirs}
12@@ -14,6 +16,7 @@
13 target_link_libraries(
14 server_platform_common
15
16+ ${KMS_UTILS_STATIC_LIBRARY}
17 ${Boost_SYSTEM_LIBRARY}
18 ${GL_LDFLAGS} ${GL_LIBRARIES}
19 )
20
21=== modified file 'src/platforms/common/server/kms-utils/CMakeLists.txt'
22--- src/platforms/common/server/kms-utils/CMakeLists.txt 2016-05-06 06:11:15 +0000
23+++ src/platforms/common/server/kms-utils/CMakeLists.txt 2016-08-04 18:55:01 +0000
24@@ -2,13 +2,16 @@
25 ${DRM_INCLUDE_DIRS}
26 )
27
28-add_library(kms_utils STATIC
29+set(KMS_UTILS_STATIC_LIBRARY "kms_utils")
30+set(KMS_UTILS_STATIC_LIBRARY ${KMS_UTILS_STATIC_LIBRARY} PARENT_SCOPE)
31+
32+add_library(${KMS_UTILS_STATIC_LIBRARY} STATIC
33 drm_mode_resources.cpp
34 drm_mode_resources.h
35 kms_connector.cpp
36 kms_connector.h
37 )
38
39-target_link_libraries(kms_utils
40+target_link_libraries(${KMS_UTILS_STATIC_LIBRARY}
41 ${DRM_LDFLAGS} ${DRM_LIBRARIES}
42 )
43
44=== modified file 'tests/unit-tests/CMakeLists.txt'
45--- tests/unit-tests/CMakeLists.txt 2016-08-01 07:24:32 +0000
46+++ tests/unit-tests/CMakeLists.txt 2016-08-04 18:55:01 +0000
47@@ -130,7 +130,6 @@
48 mircommon
49 client_platform_common
50 server_platform_common
51- kms_utils
52
53 mirclient-static
54 mirclientlttng-static

Subscribers

People subscribed via source and target branches