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

[Mikkel Kamstrup Erlandsen]

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

[lp:~kamstrup/bamf-qt/fixes-for-jhbuild]

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)]

Works well, will accept.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-11-29 06:21:49 +0000
+++ CMakeLists.txt	2011-12-14 12:34:04 +0000
@@ -100,11 +100,18 @@
 add_custom_target(check)
 
 # Install
-# We don’t refer to QT_IMPORTS_DIR, because it requires at least one QML plugin
-# installed. Query qmake instead. (see bug #894805)
-_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
+# You can override the directory in which we install QML imports
+# by setting QT_IMPORTS_DIR to a path on the cmake command line
+if(QT_IMPORTS_DIR)
+  set(qt_imports_dir ${QT_IMPORTS_DIR})
+else()
+  # Query qmake directly because of
+  # https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805
+  _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
+endif()
 set(IMPORT_INSTALL_DIR ${qt_imports_dir}/bamf)
 set(INCLUDE_INSTALL_DIR include/QtBamf)
+message(STATUS "Installing imports in ${IMPORT_INSTALL_DIR}")
 
 ## QtBamf
 install(TARGETS QtBamf