Merge lp://staging/~ballogy/bamf-qt/fix-imports-dir-location into lp://staging/bamf-qt
Proposed by
Balló György
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | 392 |
Merged at revision: | 390 |
Proposed branch: | lp://staging/~ballogy/bamf-qt/fix-imports-dir-location |
Merge into: | lp://staging/bamf-qt |
Diff against target: |
15 lines (+4/-1) 1 file modified
CMakeLists.txt (+4/-1) |
To merge this branch: | bzr merge lp://staging/~ballogy/bamf-qt/fix-imports-dir-location |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Olivier Tilloy (community) | Approve | ||
Review via email: mp+83248@code.staging.launchpad.net |
Description of the change
This change replace the hard-coded imports dir location with QT_IMPORTS_DIR variable. I need it for Arch Linux, because it uses /usr/lib/qt/imports instead of /usr/lib/
To post a comment you must log in.
The change looks sound. DIR-NOTFOUND" ) fallback on the hardcoded value /usr/lib/ qt4/imports. What do you think?
However I tested it on Ubuntu and it appears that cmake has a bug whereby QT_IMPORTS_DIR is not correctly defined (I reported it as bug #894805).
Therefore it cannot be merged as is. A possible solution would be to check for the value of ${QT_IMPORTS_DIR} and if it’s invalid (e.g. "QT_IMPORTS_