Merge lp:~osomon/bamf-qt/libdir into lp:bamf-qt

Proposed by Olivier Tilloy on 2011-11-10
Status: Needs review
Proposed branch: lp:~osomon/bamf-qt/libdir
Merge into: lp:bamf-qt
Diff against target: 151 lines (+40/-24)
7 files modified
.bzrignore (+3/-0)
CMakeLists.txt (+20/-9)
debian/changelog (+5/-1)
debian/libqtbamf-dev.dirs (+0/-2)
debian/libqtbamf-dev.install.in (+3/-3)
debian/libqtbamf1.install.in (+3/-3)
libqtbamf.pc.in (+6/-6)
To merge this branch: bzr merge lp:~osomon/bamf-qt/libdir
Reviewer Review Type Date Requested Status
unity-2d-team 2011-11-10 Pending
Review via email: mp+81898@code.launchpad.net

Commit message

Un-hardcode standard install paths (use GNUInstallDirs.cmake).

To post a comment you must log in.
Balló György (ballogy) wrote :

Please use ${QT_IMPORTS_DIR}/bamf instead of ${CMAKE_INSTALL_LIBDIR}/qt4/imports/bamf as a value of IMPORT_INSTALL_DIR, because Arch Linux uses /usr/lib/qt/imports directory to store imports. (See my branch: lp:~ballogy/bamf-qt/fix-imports-dir-location and it's merge proposal.)

lp:~osomon/bamf-qt/libdir updated on 2011-11-29
394. By Olivier Tilloy on 2011-11-29

Merge the latest changes from the trunk, and resolve conflicts.

395. By Olivier Tilloy on 2011-11-29

Fix the substitutions in debian/libqtbamf1.install.in to account for the latest changes from the trunk.

Unmerged revisions

395. By Olivier Tilloy on 2011-11-29

Fix the substitutions in debian/libqtbamf1.install.in to account for the latest changes from the trunk.

394. By Olivier Tilloy on 2011-11-29

Merge the latest changes from the trunk, and resolve conflicts.

393. By Olivier Tilloy on 2011-11-10

Add changes to the debian changelog.

392. By Olivier Tilloy on 2011-11-10

Merge the latest changes from the trunk.

391. By Olivier Tilloy on 2011-11-10

Un-hardcode install paths in debian install files.

390. By Olivier Tilloy on 2011-11-10

Remove unused file.

389. By Olivier Tilloy on 2011-11-10

Have the pkg-config file generated with correct target directories.
Fix its version number (hardcoded in want of a better solution) and its dependencies.

388. By Olivier Tilloy on 2011-11-10

Un-hardcode standard install paths (use GNUInstallDirs.cmake).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-11-10 18:05:50 +0000
3+++ .bzrignore 2011-11-29 17:17:24 +0000
4@@ -3,10 +3,13 @@
5 cmake_install.cmake
6 Makefile
7
8+libqtbamf.pc
9 moc_*.cxx
10 libQtBamf.so*
11 test
12
13+debian/libqtbamf1.install
14+debian/libqtbamf-dev.install
15 debian/files
16 debian/tmp/
17 debian/libqtbamf1/
18
19=== modified file 'CMakeLists.txt'
20--- CMakeLists.txt 2011-11-29 06:21:49 +0000
21+++ CMakeLists.txt 2011-11-29 17:17:24 +0000
22@@ -1,13 +1,28 @@
23 project(libQtBamf)
24 cmake_minimum_required(VERSION 2.8)
25
26+# Standard install paths
27+include(GNUInstallDirs)
28+
29 # Dependencies
30 include(FindPkgConfig)
31 find_package(Qt4 REQUIRED)
32
33+# We don’t refer to QT_IMPORTS_DIR, because it requires at least one QML plugin
34+# installed. Query qmake instead. (see bug #894805)
35+_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
36+set(IMPORT_INSTALL_DIR ${qt_imports_dir}/bamf)
37+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/QtBamf)
38+
39 # Build flags
40 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -std=c++0x")
41
42+# Configure debian install files
43+string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" 1 -1 DEBIAN_INSTALL_PREFIX)
44+string(SUBSTRING "${IMPORT_INSTALL_DIR}" 1 -1 DEBIAN_IMPORT_INSTALL_DIR)
45+configure_file(debian/libqtbamf1.install.in ${CMAKE_SOURCE_DIR}/debian/libqtbamf1.install @ONLY)
46+configure_file(debian/libqtbamf-dev.install.in ${CMAKE_SOURCE_DIR}/debian/libqtbamf-dev.install @ONLY)
47+
48 # Sources
49 ## QtBamf
50 set(QtBamf_SRCS
51@@ -100,15 +115,10 @@
52 add_custom_target(check)
53
54 # Install
55-# We don’t refer to QT_IMPORTS_DIR, because it requires at least one QML plugin
56-# installed. Query qmake instead. (see bug #894805)
57-_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
58-set(IMPORT_INSTALL_DIR ${qt_imports_dir}/bamf)
59-set(INCLUDE_INSTALL_DIR include/QtBamf)
60
61 ## QtBamf
62 install(TARGETS QtBamf
63- LIBRARY DESTINATION lib${LIB_SUFFIX}
64+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
65 )
66
67 install(FILES
68@@ -123,9 +133,10 @@
69 DESTINATION ${INCLUDE_INSTALL_DIR}
70 )
71
72-# FIXME: Generate from ${CMAKE_INSTALL_PREFIX}
73-install(FILES libqtbamf.pc
74- DESTINATION lib/pkgconfig
75+set(PC_FILE libqtbamf.pc)
76+configure_file(${PC_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE} @ONLY)
77+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE}
78+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
79 )
80
81 ## QtBamfQml
82
83=== modified file 'debian/changelog'
84--- debian/changelog 2011-11-10 18:33:04 +0000
85+++ debian/changelog 2011-11-29 17:17:24 +0000
86@@ -1,8 +1,12 @@
87 libqtbamf (0.2.3-0ubuntu1) UNRELEASED; urgency=low
88
89 * debian/control: Remove unused build dependency (qt4-qmake).
90+ * debian/libqtbamf-dev.dirs: Remove unused file.
91+ * debian/libqtbamf1.install:
92+ * debian/libqtbamf-dev.install:
93+ - Un-hardcode install paths.
94
95- -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 10 Nov 2011 13:31:11 -0500
96+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 10 Nov 2011 14:03:32 -0500
97
98 libqtbamf (0.2.2-0ubuntu1) oneiric; urgency=low
99
100
101=== removed file 'debian/libqtbamf-dev.dirs'
102--- debian/libqtbamf-dev.dirs 2010-08-31 10:27:54 +0000
103+++ debian/libqtbamf-dev.dirs 1970-01-01 00:00:00 +0000
104@@ -1,2 +0,0 @@
105-usr/include/QtBamf
106-usr/lib/pkgconfig
107
108=== renamed file 'debian/libqtbamf-dev.install' => 'debian/libqtbamf-dev.install.in'
109--- debian/libqtbamf-dev.install 2011-01-13 18:12:59 +0000
110+++ debian/libqtbamf-dev.install.in 2011-11-29 17:17:24 +0000
111@@ -1,3 +1,3 @@
112-usr/lib/libQtBamf.so
113-usr/include/QtBamf/*.h
114-usr/lib/pkgconfig/libqtbamf.pc
115+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libQtBamf.so
116+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/QtBamf/*.h
117+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/pkgconfig/libqtbamf.pc
118
119=== renamed file 'debian/libqtbamf1.install' => 'debian/libqtbamf1.install.in'
120--- debian/libqtbamf1.install 2011-01-14 16:52:47 +0000
121+++ debian/libqtbamf1.install.in 2011-11-29 17:17:24 +0000
122@@ -1,3 +1,3 @@
123-usr/lib/libQtBamf.so.*
124-usr/lib/qt4/imports/bamf/libQtBamfQml.so
125-usr/lib/qt4/imports/bamf/qmldir
126+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libQtBamf.so.*
127+@DEBIAN_IMPORT_INSTALL_DIR@/libQtBamfQml.so
128+@DEBIAN_IMPORT_INSTALL_DIR@/qmldir
129
130=== renamed file 'libqtbamf.pc' => 'libqtbamf.pc.in'
131--- libqtbamf.pc 2011-01-13 17:57:36 +0000
132+++ libqtbamf.pc.in 2011-11-29 17:17:24 +0000
133@@ -1,12 +1,12 @@
134-prefix=/usr
135-exec_prefix=/usr
136-libdir=${exec_prefix}/lib
137-includedir=${prefix}/include
138+prefix=@CMAKE_INSTALL_PREFIX@
139+exec_prefix=@CMAKE_INSTALL_PREFIX@
140+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
141+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
142
143 Name: libqtbamf
144 Description: Qt binding and QML plugin for the bamf d-bus server.
145-Version: 0.0
146+Version: 0.2.2
147
148-Requires: QtDBus
149+Requires.private: QtCore QtDBus
150 Libs: -L${libdir} -lQtBamf
151 Cflags: -I${includedir}/QtBamf

Subscribers

People subscribed via source and target branches