Merge lp://staging/~jamesh/thumbnailer/fix-pkg-config into lp://staging/thumbnailer/devel
| Status: | Merged |
|---|---|
| Approved by: | Michi Henning |
| Approved revision: | 361 |
| Merged at revision: | 360 |
| Proposed branch: | lp://staging/~jamesh/thumbnailer/fix-pkg-config |
| Merge into: | lp://staging/thumbnailer/devel |
| Diff against target: |
106 lines (+17/-23) 4 files modified
CMakeLists.txt (+8/-11) include/internal/version.h.in (+3/-3) include/unity/thumbnailer/qt/CMakeLists.txt (+2/-1) src/libthumbnailer-qt/libthumbnailer-qt.pc.in (+4/-8) |
| To merge this branch: | bzr merge lp://staging/~jamesh/thumbnailer/fix-pkg-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| unity-api-1-bot | continuous-integration | Approve | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix up the libthumbnailer-qt pkg-config file.
Description of the change
Fix up the libthumbnailer-qt pkg-config file.
This can be tested in-tree. From the build directory, you should be able to list the include directories needed by the library with:
PKG_
And the libraries with:
PKG_
You can compare this to the installed version by leaving PKG_CONFIG_PATH unset. Things that have changed:
1. the command no longer fails due to no .pc file providing "thumbnailer-
2. The -I flag for libthumbnailer-qt's headers now points at the base directory rather than the unity/thumbnail
3. The Include directories for Qt5Gui/Qt5Core are included (which are needed to use the library)
4. The libs output includes Qt5Gui/Qt5Core.
I also took the opportunity to switch to the new form of the cmake project() statement that lets us specify the project version number.
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) | # |
FAILED: Continuous integration, rev:359
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/