Merge lp:~kamstrup/bamf-qt/fixes-for-jhbuild into lp:bamf-qt

Proposed by Mikkel Kamstrup Erlandsen on 2011-12-14
Status: Merged
Approved by: Gerry Boland on 2012-01-05
Approved revision: 392
Merged at revision: 392
Proposed branch: lp:~kamstrup/bamf-qt/fixes-for-jhbuild
Merge into: lp:bamf-qt
Diff against target: 25 lines (+10/-3)
1 file modified
CMakeLists.txt (+10/-3)
To merge this branch: bzr merge lp:~kamstrup/bamf-qt/fixes-for-jhbuild
Reviewer Review Type Date Requested Status
Gerry Boland 2011-12-14 Approve on 2012-01-05
Review via email: mp+85614@code.launchpad.net

Description of the change

Fix installation of libQtBamfQml.so into qt4/imports under jhbuild, by allowing one to override the directory by setting -DQT_IMPORTS_DIR=/my/dir on the cmake command line

I am working on adding the entire unity-2d stack to the lp:unity-jhbuild setup, and this fix is a requirement to get that working

To post a comment you must log in.
391. By Mikkel Kamstrup Erlandsen on 2011-12-14

Fix installation of libQtBamfQml.so into qt4/imports under jhbuild, by allowing one to override the directory by setting -DQT_IMPORTS_DIR on the cmake commend line

392. By Mikkel Kamstrup Erlandsen on 2011-12-14

Update comments on QT_IMPORTS_DIR and QT_INSTALL_IMPORTS usage

Gerry Boland (gerboland) wrote :

Works well, will accept.

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 2011-11-29 06:21:49 +0000
3+++ CMakeLists.txt 2011-12-14 12:34:04 +0000
4@@ -100,11 +100,18 @@
5 add_custom_target(check)
6
7 # Install
8-# We don’t refer to QT_IMPORTS_DIR, because it requires at least one QML plugin
9-# installed. Query qmake instead. (see bug #894805)
10-_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
11+# You can override the directory in which we install QML imports
12+# by setting QT_IMPORTS_DIR to a path on the cmake command line
13+if(QT_IMPORTS_DIR)
14+ set(qt_imports_dir ${QT_IMPORTS_DIR})
15+else()
16+ # Query qmake directly because of
17+ # https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805
18+ _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
19+endif()
20 set(IMPORT_INSTALL_DIR ${qt_imports_dir}/bamf)
21 set(INCLUDE_INSTALL_DIR include/QtBamf)
22+message(STATUS "Installing imports in ${IMPORT_INSTALL_DIR}")
23
24 ## QtBamf
25 install(TARGETS QtBamf

Subscribers

People subscribed via source and target branches