Merge lp:~agateau/libdbusmenu-qt/cmake-config into lp:libdbusmenu-qt

[Aurélien Gâteau]

This change install CMake config files for dbusmenu-qt and dbusmenu-qt5. This makes it easy for other projects to use the library with find(dbusmenu-qt) or find(dbusmenu-qt5) without having to ship a FindDBusMenuQt.cmake file.

(More about this topic here: http://www.cmake.org/Wiki/CMake/Tutorials/Packaging ).

Test programs available here: http://agateau.com/tmp/dmqt-samples.tar.bz2

[Ted Gould (ted)]

I'm a bit confused on why we'd want to ship a cmake fragment. It seems like the pkgconfig files already provide this type of interface for people using the library, no?

review: Needs Information

[Aurélien Gâteau (agateau)]

> I'm a bit confused on why we'd want to ship a cmake fragment. It seems like
> the pkgconfig files already provide this type of interface for people using
> the library, no?

The cmake config file is the cmake equivalent of pkgconfig files. It is easier to use from cmake than a pkgconfig file.

[Ted Gould (ted)]

Eh, sure. I'm not convinced it is that much easier, but I see no reason to not have it. CMake people are weird :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-autolanding/9/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/3181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-trusty-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-trusty-armhf-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Aurélien Gâteau (agateau)]

> CMake people are weird :-)

Heh, yes, we can't help it :)

Landing failed because the new files are not in the -dev package, I am investigating the best way to do this.

[lp:~agateau/libdbusmenu-qt/cmake-config]

252. By Aurélien Gâteau on 2013-11-12

Install .cmake files in relevant -dev packages, set build type

This patch defines the build type because if it is not set, we end up with
dbusmenu-qt*-targets-noconfig.cmake files instead of
dbusmenu-qt*-targets-relwithdebinfo.cmake

[Aurélien Gâteau (agateau)]

Hey, can you push the button to force Jenkins to give the branch another try?

[Sebastien Bacher (seb128)]

(The CI infrastructure is being moved to a new location and down for some days, it should be back online later in the day)

[Aurélien Gâteau (agateau)]

Hi Sebastien! is the CI infrastructure back?

[Sebastien Bacher (seb128)]

hey, yes, not sure why it's not retrying this one, let me ask the CI crew ;-)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-autolanding/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-trusty-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-trusty-armhf-autolanding/4
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-trusty-armhf-autolanding/4/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

ok, seems CI was happy this time, out of the revid thing ... trying to approve it then

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Aurélien Gâteau (agateau)]

Thanks Sébastien!

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-25 18:17:08 +0000
+++ CMakeLists.txt	2013-11-12 13:32:30 +0000
@@ -1,5 +1,5 @@
 project(dbusmenu-qt)
-cmake_minimum_required(VERSION 2.6.0)
+cmake_minimum_required(VERSION 2.8.0)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 # Build options
@@ -57,8 +57,11 @@
     set(QT_SUFFIX "qt")
 endif()
 
+include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+set(CMAKECONFIG_INSTALL_DIR "${LIB_DESTINATION}/cmake/dbusmenu-${QT_SUFFIX}")
+set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}")
 
 # dist targets
 set(ARCHIVE_NAME libdbusmenu-${QT_SUFFIX}-${dbusmenu_qt_VERSION})
@@ -103,3 +106,25 @@
         DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}-doc
         )
 endif(WITH_DOC)
+
+# Generate dbusmenu-qt-config* files
+configure_package_config_file(
+    dbusmenu-qt-config.cmake.in
+    ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config.cmake
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+    PATH_VARS INCLUDE_INSTALL_DIR
+    )
+
+write_basic_package_version_file(
+    ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config-version.cmake
+    VERSION ${dbusmenu_qt_VERSION}
+    COMPATIBILITY SameMajorVersion
+    )
+
+# Install dbusmenu-qt-config* files
+install(FILES
+    ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config.cmake
+    ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config-version.cmake
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    COMPONENT Devel
+    )

=== added file 'dbusmenu-qt-config.cmake.in'
--- dbusmenu-qt-config.cmake.in	1970-01-01 00:00:00 +0000
+++ dbusmenu-qt-config.cmake.in	2013-11-12 13:32:30 +0000
@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/dbusmenu-@[e-mail]")
+
+set_and_check(dbusmenu-@QT_SUFFIX@_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")

=== modified file 'debian/libdbusmenu-qt-dev.install'
--- debian/libdbusmenu-qt-dev.install	2013-03-28 18:01:24 +0000
+++ debian/libdbusmenu-qt-dev.install	2013-11-12 13:32:30 +0000
@@ -1,3 +1,4 @@
 usr/include/dbusmenu-qt/*
 usr/lib/*/lib*-qt.so
 usr/lib/*/pkgconfig/dbusmenu-qt.pc
+usr/lib/*/cmake/dbusmenu-qt/*

=== modified file 'debian/libdbusmenu-qt5-dev.install'
--- debian/libdbusmenu-qt5-dev.install	2013-03-28 18:01:24 +0000
+++ debian/libdbusmenu-qt5-dev.install	2013-11-12 13:32:30 +0000
@@ -1,3 +1,4 @@
 usr/include/dbusmenu-qt5/*
 usr/lib/*/lib*-qt5.so
 usr/lib/*/pkgconfig/dbusmenu-qt5.pc
+usr/lib/*/cmake/dbusmenu-qt5/*

=== modified file 'debian/rules'
--- debian/rules	2013-05-02 15:32:36 +0000
+++ debian/rules	2013-11-12 13:32:30 +0000
@@ -11,8 +11,8 @@
 override_dh_auto_configure:
 	mkdir qt4
 	mkdir qt5
-	cd qt4 && QT_SELECT=qt4 cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT4=true ../
-	cd qt5 && QT_SELECT=qt5 cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT5=true ../
+	cd qt4 && QT_SELECT=qt4 cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT4=true -DCMAKE_BUILD_TYPE=RelWithDebInfo ../
+	cd qt5 && QT_SELECT=qt5 cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT5=true -DCMAKE_BUILD_TYPE=RelWithDebInfo ../
 
 override_dh_auto_build:
 	cd qt4 && make

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-03-28 15:51:14 +0000
+++ src/CMakeLists.txt	2013-11-12 13:32:30 +0000
@@ -89,15 +89,20 @@
 endif()
 
 install(TARGETS dbusmenu-${QT_SUFFIX}
+    EXPORT dbusmenu-${QT_SUFFIX}-targets
     LIBRARY DESTINATION ${LIB_DESTINATION}
-    RUNTIME DESTINATION bin)
+    RUNTIME DESTINATION bin
+    )
+
+install(EXPORT dbusmenu-${QT_SUFFIX}-targets
+    DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 
 install(DIRECTORY .
-    DESTINATION include/dbusmenu-${QT_SUFFIX}
+    DESTINATION ${INCLUDE_INSTALL_DIR}
     FILES_MATCHING PATTERN "*.h"
     PATTERN "*_p.h" EXCLUDE
     )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
-    DESTINATION include/dbusmenu-${QT_SUFFIX}
+    DESTINATION ${INCLUDE_INSTALL_DIR}
     )