Merge lp:~brandontschaefer/miral/miral into lp:~alan-griffiths/miral/trunk
Status: | Merged |
---|---|
Merged at revision: | 123 |
Proposed branch: | lp:~brandontschaefer/miral/miral |
Merge into: | lp:~alan-griffiths/miral/trunk |
Diff against target: |
120 lines (+71/-1) 6 files modified
CMakeLists.txt (+4/-0) miral-shell/CMakeLists.txt (+5/-0) miral-shell/desktop/CMakeLists.txt (+12/-0) miral-shell/desktop/miral-shell.desktop.in (+18/-0) miral-shell/desktop/ubuntu-logo.svg (+27/-0) miral/CMakeLists.txt (+5/-1) |
To merge this branch: | bzr merge lp:~brandontschaefer/miral/miral |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | 2016-04-11 | Approve on 2016-04-12 | |
Review via email:
|
Commit message
Install the library + shell binary
Install a desktop file + ubuntu svg logo (for now)
Description of the change
Install the library + shell binary
Install a desktop file + ubuntu svg logo (for now)
Alan Griffiths (alan-griffiths) wrote : | # |
Probably a minor config issue, but /usr/local/lib/ doesn't seem to be searched by default. So this install doesn't actually work.
Brandon Schaefer (brandontschaefer) wrote : | # |
Hmm yeah you're right, I usually expect things to be install in /usr (for CMAKE_INTSALL_
Alan Griffiths (alan-griffiths) wrote : | # |
> Hmm yeah you're right, I usually expect things to be install in /usr (for
> CMAKE_INTSALL_
> that is looked at by default or if we should write a wrapper to set these env
> variables?
We could default CMAKE_INSTALL_
Brandon Schaefer (brandontschaefer) wrote : | # |
That should happen once we do debain stuff (when the package gets actually built)
Alan Griffiths (alan-griffiths) wrote : | # |
I mean like:
if (CMAKE_
set(
endif()
The debian stuff will, of course, override this
Brandon Schaefer (brandontschaefer) wrote : | # |
O yeah that would be nice!
Brandon Schaefer (brandontschaefer) wrote : | # |
/me adds it to his branch
- 107. By Brandon Schaefer on 2016-04-12
-
Default to /usr vs /usr/local
Use 4 spaces in CMakeLists.txt
OK