Merge lp://qastaging/~3v1n0/unity/cmake-libs-prefixes into lp://qastaging/unity
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Andrea Azzarone |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4191 |
| Proposed branch: | lp://qastaging/~3v1n0/unity/cmake-libs-prefixes |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
431 lines (+96/-76) 14 files modified
CMakeLists.txt (+8/-49) UnityCore/DBusIndicators.cpp (+1/-1) UnityCore/GnomeSessionManager.cpp (+17/-7) config.h.cmake (+3/-2) data/CMakeLists.txt (+37/-1) data/unity7.conf.in (+1/-1) services/CMakeLists.txt (+1/-1) services/unity-panel-service-lockscreen.conf.in (+1/-1) services/unity-panel-service-lockscreen.service.in (+7/-0) services/unity-panel-service.conf.in (+1/-1) tools/CMakeLists.txt (+2/-2) unity-shared/DashStyle.cpp (+2/-2) unity-shared/GnomeFileManager.cpp (+4/-2) unity-shared/UpstartWrapper.cpp (+11/-6) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/cmake-libs-prefixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Azzarone (community) | Approve | ||
|
Review via email:
|
|||
Commit message
CMake: move data and setting files in proper folder, define shared libdir variables
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1