ca75aed246
* Add myself to Uploaders. * Build-Depend on liblzma-dev and libjsoncpp-dev. * Drop patches merged upstream: - fix-FindImageMagick-1.diff - fix-FindImageMagick-2.diff - FindJNI_ppc64le.diff - hurd_host_system_processor.diff * Refresh patches: - FindBoost_add_-lpthread_#563479.diff - FindJNI.cmake.mips.patch - fix-ftbfs-on-kfreebsd.patch - fix-hdf5-hl.patch - qt_import_dir_variable.diff * Bump Standards-Version to 3.9.6. * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch (Closes: #760298)
24 lines
980 B
Diff
24 lines
980 B
Diff
From: Jonathan Riddell <jriddell@ubuntu.com>
|
|
Subject: FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system.
|
|
Date: 2012-01-18 16:00:49 UTC
|
|
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.
|
|
|
|
Index: cmake/Modules/FindQt4.cmake
|
|
===================================================================
|
|
--- cmake.orig/Modules/FindQt4.cmake
|
|
+++ cmake/Modules/FindQt4.cmake
|
|
@@ -734,7 +734,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()
|