Unity

Merge lp:~azzar1/unity/cmake-3 into lp:unity

  1. cmake-3
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3984
Proposed branch: lp:~azzar1/unity/cmake-3
Merge into: lp:unity
Diff against target: 32 lines (+3/-3)
2 files modified
lockscreen/CMakeLists.txt (+3/-2)
plugins/unityshell/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~azzar1/unity/cmake-3
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+266573@code.launchpad.net

Commit message

Fixes that enable building unity from sources with cmake3 (wily).

Description of the change

Fixes that enable building unity from sources with cmake3 (wily).

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

PASSED: Continuous integration, rev:3984
http://jenkins.qa.ubuntu.com/job/unity-ci/1277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1277/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Mmm, OK, haven't run into a problem with CMake 3.0 that this would solve and I see no bugs that it closes, but it's marked as a prerequistie for GCC-5 so I'll accept it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/CMakeLists.txt'
2--- lockscreen/CMakeLists.txt 2014-10-21 13:45:43 +0000
3+++ lockscreen/CMakeLists.txt 2015-07-31 14:45:24 +0000
4@@ -9,7 +9,7 @@
5 string (REPLACE ";" " " CFLAGS "${CFLAGS}")
6 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
7
8-set (LIBS ${CACHED_UNITY_DEPS_LDFLAGS} ${UNITY_STANDALONE_LADD})
9+set (LIBS ${CACHED_UNITY_DEPS_LDFLAGS} pam)
10
11 include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
12
13@@ -34,5 +34,6 @@
14 )
15
16 add_library (lockscreen-lib STATIC ${LOCKSCREEN_SOURCES})
17-add_dependencies (lockscreen-lib unity-core-${UNITY_API_VERSION} unity-shared pam)
18+target_link_libraries (lockscreen-lib ${LIBS})
19+add_dependencies (lockscreen-lib unity-core-${UNITY_API_VERSION} unity-shared)
20 add_pch(pch/lockscreen_pch.hh lockscreen-lib)
21
22=== modified file 'plugins/unityshell/CMakeLists.txt'
23--- plugins/unityshell/CMakeLists.txt 2014-01-30 16:00:34 +0000
24+++ plugins/unityshell/CMakeLists.txt 2015-07-31 14:45:24 +0000
25@@ -26,7 +26,6 @@
26 decorations-lib
27 hud-lib
28 launcher-lib
29- pam
30 lockscreen-lib
31 panel-lib
32 shortcuts-lib