Merge lp:~agateau/libdbusmenu-qt/define-include-dir into lp:libdbusmenu-qt

Proposed by Aurélien Gâteau on 2014-06-18
Status: Merged
Approved by: Sebastien Bacher on 2014-06-18
Approved revision: 265
Merged at revision: 266
Proposed branch: lp:~agateau/libdbusmenu-qt/define-include-dir
Merge into: lp:libdbusmenu-qt
Diff against target: 38 lines (+6/-2)
3 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/CMakeLists.txt (+4/-0)
To merge this branch: bzr merge lp:~agateau/libdbusmenu-qt/define-include-dir
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2014-06-18
Albert Astals Cid 2014-06-18 Pending
Review via email: mp+223509@code.launchpad.net

Commit message

With this change, users of dbusmenu-qt no longer need to call include_directories(${dbusmenu-qt5_INCLUDE_DIRS}). Simply adding dbusmenu-qt5 to the target_link_libraries() call takes care of defining the include directory.

This requires CMake 2.8.11, so I bumped the minimum version numbers accordingly.

Description of the change

With this change, users of dbusmenu-qt no longer need to call include_directories(${dbusmenu-qt5_INCLUDE_DIRS}). Simply adding dbusmenu-qt5 to the target_link_libraries() call takes care of defining the include directory.

This requires CMake 2.8.11, so I bumped the minimum version numbers accordingly.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

looks fine, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-28 16:23:30 +0000
3+++ CMakeLists.txt 2014-06-18 07:45:58 +0000
4@@ -1,5 +1,5 @@
5 project(dbusmenu-qt)
6-cmake_minimum_required(VERSION 2.8.0)
7+cmake_minimum_required(VERSION 2.8.11)
8 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
9
10 # Build options
11
12=== modified file 'debian/control'
13--- debian/control 2014-01-21 07:35:05 +0000
14+++ debian/control 2014-06-18 07:45:58 +0000
15@@ -1,7 +1,7 @@
16 Source: libdbusmenu-qt
17 Section: libs
18 Priority: optional
19-Build-Depends: cmake (>= 2.8.5),
20+Build-Depends: cmake (>= 2.8.11),
21 debhelper (>= 9),
22 doxygen,
23 libqjson-dev,
24
25=== modified file 'src/CMakeLists.txt'
26--- src/CMakeLists.txt 2013-10-28 16:23:30 +0000
27+++ src/CMakeLists.txt 2014-06-18 07:45:58 +0000
28@@ -88,6 +88,10 @@
29 )
30 endif()
31
32+# Make sure linking to the target adds dbusmenu-qt install directory
33+target_include_directories(dbusmenu-${QT_SUFFIX}
34+ INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
35+
36 install(TARGETS dbusmenu-${QT_SUFFIX}
37 EXPORT dbusmenu-${QT_SUFFIX}-targets
38 LIBRARY DESTINATION ${LIB_DESTINATION}

Subscribers

People subscribed via source and target branches