diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
commit | c527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch) | |
tree | bb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |
download | poky-c527fd1f14c27855a37f2e8ac5346ce8d940ced2.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch new file mode 100644 index 0000000000..0e311f70e3 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | cmake: support OpenEmbedded Qt4 tool binary names | ||
2 | |||
3 | The FindQt4 module looks for Qt4 binaries to be able to gather the | ||
4 | paths used for compilation and also to be using during other processes | ||
5 | (translation update, translation binary generating and like) however | ||
6 | OpenEmbedded has renamed those to allow old QMake to be used in | ||
7 | parallel with the current one. This patch adds support for the | ||
8 | OpenEmbedded specific binary names. | ||
9 | |||
10 | Upstream-Status: Inappropriate [embedded specific] | ||
11 | |||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | |||
14 | Index: cmake-2.8.11/Modules/FindQt4.cmake | ||
15 | =================================================================== | ||
16 | --- cmake-2.8.11.orig/Modules/FindQt4.cmake | ||
17 | +++ cmake-2.8.11/Modules/FindQt4.cmake | ||
18 | @@ -569,7 +569,7 @@ endfunction() | ||
19 | |||
20 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | ||
21 | |||
22 | -set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) | ||
23 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) | ||
24 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | ||
25 | |||
26 | if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
27 | @@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
28 | ) | ||
29 | |||
30 | find_program(QT_RCC_EXECUTABLE | ||
31 | - NAMES rcc | ||
32 | + NAMES rcc4 rcc | ||
33 | PATHS ${QT_BINARY_DIR} | ||
34 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
35 | ) | ||
36 | |||
37 | find_program(QT_DBUSCPP2XML_EXECUTABLE | ||
38 | - NAMES qdbuscpp2xml | ||
39 | + NAMES qdbuscpp2xml4 qdbuscpp2xml | ||
40 | PATHS ${QT_BINARY_DIR} | ||
41 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
42 | ) | ||
43 | |||
44 | find_program(QT_DBUSXML2CPP_EXECUTABLE | ||
45 | - NAMES qdbusxml2cpp | ||
46 | + NAMES qdbusxml2cp4 qdbusxml2cpp | ||
47 | PATHS ${QT_BINARY_DIR} | ||
48 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
49 | ) | ||
50 | @@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
51 | ) | ||
52 | |||
53 | find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE | ||
54 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator | ||
55 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4 | ||
56 | PATHS ${QT_BINARY_DIR} | ||
57 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
58 | ) | ||