Merge lp:~thomas-voss/location-service/add-linker-flags-to-pkgconfig-setup into lp:location-service/trunk

Proposed by Thomas Voß
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 27
Merged at revision: 28
Proposed branch: lp:~thomas-voss/location-service/add-linker-flags-to-pkgconfig-setup
Merge into: lp:location-service/trunk
Diff against target: 33 lines (+3/-2)
2 files modified
data/ubuntu-location-service.pc.in (+1/-0)
examples/service/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~thomas-voss/location-service/add-linker-flags-to-pkgconfig-setup
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+180775@code.launchpad.net

Commit message

Add linker flags to pkgconfig setup.

Description of the change

Add linker flags to pkgconfig setup.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ubuntu-location-service.pc.in'
2--- data/ubuntu-location-service.pc.in 2013-05-28 14:20:45 +0000
3+++ data/ubuntu-location-service.pc.in 2013-08-19 05:55:24 +0000
4@@ -7,5 +7,6 @@
5 Description: A location service aggregating position/velocity/heading
6 updates and exporting them over dbus.
7 Version: @UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@.@UBUNTU_LOCATION_SERVICE_VERSION_MINOR@.@UBUNTU_LOCATION_SERVICE_VERSION_PATCH@
8+Libs: -L${libdir} -lubuntu-location-service
9 Cflags: -I${includedir}/ubuntu-location-service-@UBUNTU_LOCATION_SERVICE_VERSION_MAJOR@
10 Requires: dbus-cpp
11\ No newline at end of file
12
13=== modified file 'examples/service/CMakeLists.txt'
14--- examples/service/CMakeLists.txt 2013-06-13 13:57:38 +0000
15+++ examples/service/CMakeLists.txt 2013-08-19 05:55:24 +0000
16@@ -5,7 +5,7 @@
17 pkg_check_modules(DBUS dbus-1)
18 pkg_check_modules(DBUS_CPP dbus-cpp)
19 include_directories(
20- ${Boost_INCLUDE_DIRS}
21+ ${Boost_INCLUDE_DIRS}
22 ${DBUS_INCLUDE_DIRS}
23 ${DBUS_CPP_INCLUDE_DIRS}/dbus
24
25@@ -32,7 +32,7 @@
26
27 ${CMAKE_THREAD_LIBS_INIT}
28 ${Boost_LIBRARIES}
29- ${DBUS_LIBRARIES}
30+ ${DBUS_LIBRARIES}
31 )
32
33 target_link_libraries(

Subscribers

People subscribed via source and target branches