← Back to branch summary

~ubuntu-branches/ubuntu/precise/cmake/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_qt_import_dir_variable.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-01-18 16:00:49 UTC
  • Revision ID: package-import@ubuntu.com-20120118160049-n5r9wi08534lp2bj
Tags: 2.8.7-0ubuntu2
Add patch ubuntu_qt_import_dir_variable.diff to
fix LP: 894805 define QT_IMPORTS_DIR even when that dir does not exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_qt_import_dir_variable.diff
 
1
Index: cmake-2.8.6/Modules/FindQt4.cmake
 
2
===================================================================
 
3
--- cmake-2.8.6.orig/Modules/FindQt4.cmake      2011-10-04 16:09:24.000000000 +0000
 
4
+++ cmake-2.8.6/Modules/FindQt4.cmake   2012-01-18 15:57:34.234300186 +0000
 
5
@@ -684,7 +684,7 @@
 
6
   IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
 
7
     _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
 
8
     if(qt_imports_dir)
 
9
-      SET(QT_IMPORTS_DIR NOTFOUND)
 
10
+      SET(QT_IMPORTS_DIR "${qt_imports_dir}")
 
11
       foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
 
12
         set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
 
13
       endforeach(qt_cross_path)