From: Jonathan Riddell <jriddell@ubuntu.com>
Date: Wed, 18 Jan 2012 16:00:49 +0000 (+0000)
Subject: FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system.
X-Git-Tag: archive/raspbian/3.18.2-1+rpi1~1^2^2^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a58e6f3beeff2b656b895f965a861adce229c57;p=cmake.git

FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system.

Bug: http://public.kitware.com/Bug/view.php?id=14155
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805
Forwarded: yes
Origin: vendor

This happens when there are no plugins currently installed.


Gbp-Pq: Name qt_import_dir_variable.diff
---

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index b0c49e56..425d6e5d 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -726,7 +726,7 @@ if (QT_QMAKE_EXECUTABLE AND
   if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
     _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
     if(qt_imports_dir)
-      set(QT_IMPORTS_DIR NOTFOUND)
+      set(QT_IMPORTS_DIR "${qt_imports_dir}")
       foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
         set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
       endforeach()