summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-29 13:09:46 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-30 23:12:55 (GMT)
commitef2c1970e4bff3be3992014070392b0e6bc28bd2 (patch)
tree2efa4f63c5420bdcbd8c92fd26547ab8c01ddcd3
parent765dad1eab610318f63a66a13bcd29c50ba76a8c (diff)
downloadbuildroot-ef2c1970e4bff3be3992014070392b0e6bc28bd2.tar.gz
buildroot-ef2c1970e4bff3be3992014070392b0e6bc28bd2.tar.bz2
cmake: add patch to fix Qt mkspecs detection
The FindQt4 macros that search the mkspecs directory had a bug that prevented the mkspecs directory from being found, causing build failures of the qjson and grantlee. Fixes: http://autobuild.buildroot.org/results/75b/75b45da597c12034baad50492c0c8150dc1bf0aa/build-end.log http://autobuild.buildroot.org/results/3b9/3b9d022b02c4497efed178f35c069ea99a7d3eef/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch b/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch
new file mode 100644
index 0000000..8ab5a23
--- /dev/null
+++ b/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch
@@ -0,0 +1,38 @@
+From 02a18089402de70188f2cf7b33fcb6edf7506871 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 29 Dec 2013 13:35:18 +0100
+Subject: [PATCH] FindQt4: do not prepend CMake root path when searching the
+ mkspecs directory
+
+When searching for the mkspecs directory, FindQT4 uses the find_path()
+function, but it doesn't pass the NO_CMAKE_FIND_ROOT_PATH, which means
+that all paths are interpreted relatively to the CMAKE_FIND_ROOT_PATH.
+
+However, both the ${qt_mkspecs_dirs} and ${qt_cross_paths} variable
+that are passed as hints are already absolute paths, and do not need
+to be prepended by the CMAKE_FIND_ROOT_PATH.
+
+Due to this problem, FindQT4 was unable to find qconfig.pri, and
+QT_MKSPECS_DIR was left defined to "NOTFOUND".
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Modules/FindQt4.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
+index 28b8454..0b8ce92 100644
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -760,7 +760,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+ endforeach()
+ set(QT_MKSPECS_DIR NOTFOUND)
+ find_path(QT_MKSPECS_DIR NAMES qconfig.pri
+- HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
++ HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} NO_CMAKE_FIND_ROOT_PATH
+ DOC "The location of the Qt mkspecs containing qconfig.pri")
+ endif()
+
+--
+1.8.3.2
+