Merge lp:~jpakkane/connectivity-api/pkgconfig into lp:connectivity-api/14.10

Proposed by Jussi Pakkanen
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~jpakkane/connectivity-api/pkgconfig
Merge into: lp:connectivity-api/14.10
Diff against target: 14 lines (+2/-2)
1 file modified
src/qt/src/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~jpakkane/connectivity-api/pkgconfig
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+231834@code.launchpad.net

Commit message

Fix pkg-config file.

Description of the change

Fix pkg-config file.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

Thanks! LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qt/src/CMakeLists.txt'
2--- src/qt/src/CMakeLists.txt 2014-08-19 19:42:12 +0000
3+++ src/qt/src/CMakeLists.txt 2014-08-22 07:58:59 +0000
4@@ -40,8 +40,8 @@
5
6 set(PC_FILE_TARGET "${CMAKE_BINARY_DIR}/${CONNECTIVITY_QT_LIB_TARGET}.pc")
7 set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
8-set(includedir "${CCONNECTIVITY_QT_INCLUDE_DIR}")
9-set(ABSOLUTE_SO_FILE "${CMAKE_INSTALL_FULL_LIBDIR}/${CONNECTIVITY_QT_LIB_TARGET}.so.${SO_VERSION}")
10+set(includedir "${CONNECTIVITY_QT_INCLUDE_DIR}")
11+set(ABSOLUTE_SO_FILE "${CMAKE_INSTALL_FULL_LIBDIR}/lib${CONNECTIVITY_QT_LIB_TARGET}.so.${SO_VERSION}")
12 configure_file("connectivity-qt.pc.in" ${PC_FILE_TARGET} @ONLY)
13 install(
14 FILES ${PC_FILE_TARGET}

Subscribers

People subscribed via source and target branches

to all changes: