summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-07-04 12:26:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 09:42:00 +0100
commit09fea03644f15af45e5fac8fd035f74e3cd9146f (patch)
treecf45d9358c04080fc0760972ca02d8cbf8a4a64a /meta/recipes-devtools
parent89a8dcc9e8666111a42664d9185d39b04361d56f (diff)
downloadpoky-09fea03644f15af45e5fac8fd035f74e3cd9146f.tar.gz
cmake: fix configure error if system Qt installation is broken
If the host Qt installation exists but is incomplete or the installed qmake architecture doesn't match that of the Qt libraries, cmake was failing at do_configure. cmake 2.8.10 failed silently here so we should make 2.8.11 do the same. Fixes [YOCTO #4565]. (From OE-Core rev: 2bf46fbd25e1a3a44d556758f536fa26c44edb03) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc1
-rw-r--r--meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch55
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6144d51be4..014ff5a750 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -15,6 +15,7 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
15 file://support-oe-qt4-tools-names.patch \ 15 file://support-oe-qt4-tools-names.patch \
16 file://aarch64-cmake.patch \ 16 file://aarch64-cmake.patch \
17 file://aarch64-kwsys.patch \ 17 file://aarch64-kwsys.patch \
18 file://qt4-fail-silent.patch \
18 " 19 "
19 20
20inherit autotools 21inherit autotools
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
new file mode 100644
index 0000000000..fd39f3f9e7
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
@@ -0,0 +1,55 @@
1Fail silently if system Qt installation is broken
2
3Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the
4following error if the system Qt installation is broken:
5
6CMake Error at Modules/FindQt4.cmake:1028 (set_property):
7 set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet
8 been created.
9Call Stack (most recent call first):
10 Tests/RunCMake/CMakeLists.txt:79 (find_package)
11
12Upstream-Status: Pending
13
14Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15
16--- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100
17+++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100
18@@ -1025,21 +1025,22 @@
19 set(_configs)
20 endmacro()
21
22-
23- # Set QT_xyz_LIBRARY variable and add
24- # library include path to QT_INCLUDES
25- _QT4_ADJUST_LIB_VARS(QtCore)
26- set_property(TARGET Qt4::QtCore APPEND PROPERTY
27- INTERFACE_INCLUDE_DIRECTORIES
28- "${QT_MKSPECS_DIR}/default"
29- ${QT_INCLUDE_DIR}
30- )
31- set_property(TARGET Qt4::QtCore PROPERTY
32- INTERFACE_QT_MAJOR_VERSION 4
33- )
34- set_property(TARGET Qt4::QtCore APPEND PROPERTY
35- COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION
36- )
37+ if(QT_QTCORE_FOUND)
38+ # Set QT_xyz_LIBRARY variable and add
39+ # library include path to QT_INCLUDES
40+ _QT4_ADJUST_LIB_VARS(QtCore)
41+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
42+ INTERFACE_INCLUDE_DIRECTORIES
43+ "${QT_MKSPECS_DIR}/default"
44+ ${QT_INCLUDE_DIR}
45+ )
46+ set_property(TARGET Qt4::QtCore PROPERTY
47+ INTERFACE_QT_MAJOR_VERSION 4
48+ )
49+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
50+ COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION
51+ )
52+ endif()
53
54 foreach(QT_MODULE ${QT_MODULES})
55 _QT4_ADJUST_LIB_VARS(${QT_MODULE})