summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-05-12 15:36:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 16:08:53 +0100
commitaa721aa065ffdb5eef3f0e3ed87160f72a2d7182 (patch)
tree4ed0f9a5363fbe9d0f542e0eb909ef9fb8d7f050 /meta/recipes-devtools
parent4d62860da31c6aa97fb5debbd4c274a6098bcea4 (diff)
downloadpoky-aa721aa065ffdb5eef3f0e3ed87160f72a2d7182.tar.gz
cmake: add support for oe qt4 tools names
The FindQt4 module looks for Qt4 binaries to be able to gather the paths used for compilation and also to be using during other processes (translation update, translation binary generating and like) however OpenEmbedded has renamed those to allow old QMake to be used in parallel with the current one. This patch adds support for the OpenEmbedded specific binary names. (From OE-Core rev: 6317c91aacf55cd7757a4fad0346cb541e9a1c2b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.3.bb2
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch98
3 files changed, 101 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
index 159541636b..29b3d87e88 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
@@ -1,7 +1,7 @@
1CMAKE_MAJOR_VERSION="2.8" 1CMAKE_MAJOR_VERSION="2.8"
2require cmake.inc 2require cmake.inc
3inherit native 3inherit native
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921" 6SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
7SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288" 7SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index f6b1c3b1b9..eed93460ed 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -9,7 +9,8 @@ LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f372516292ff7c33337bf16a74a5f9a8 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f372516292ff7c33337bf16a74a5f9a8 \
10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" 10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
11 11
12SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz" 12SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
13 file://support-oe-qt4-tools-names.patch"
13 14
14inherit autotools 15inherit autotools
15 16
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..9bccd40d71
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
@@ -0,0 +1,98 @@
1cmake: support OpenEmbedded Qt4 tool binary names
2
3The FindQt4 module looks for Qt4 binaries to be able to gather the
4paths used for compilation and also to be using during other processes
5(translation update, translation binary generating and like) however
6OpenEmbedded has renamed those to allow old QMake to be used in
7parallel with the current one. This patch adds support for the
8OpenEmbedded specific binary names.
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13
14--- a/Modules/FindQt4.cmake
15+++ b/Modules/FindQt4.cmake
16@@ -461,7 +461,7 @@
17 # check for qmake
18 # Debian uses qmake-qt4
19 # macports' Qt uses qmake-mac
20-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
21+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac PATHS
22 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
23 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
24 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
25@@ -988,13 +988,13 @@
26 ENDIF(QT_QMAKE_CHANGED)
27
28 FIND_PROGRAM(QT_MOC_EXECUTABLE
29- NAMES moc-qt4 moc
30+ NAMES moc-qt4 moc4 moc
31 PATHS ${QT_BINARY_DIR}
32 NO_DEFAULT_PATH
33 )
34
35 FIND_PROGRAM(QT_UIC_EXECUTABLE
36- NAMES uic-qt4 uic
37+ NAMES uic-qt4 uic4 uic
38 PATHS ${QT_BINARY_DIR}
39 NO_DEFAULT_PATH
40 )
41@@ -1006,49 +1006,49 @@
42 )
43
44 FIND_PROGRAM(QT_RCC_EXECUTABLE
45- NAMES rcc
46+ NAMES rcc4 rcc
47 PATHS ${QT_BINARY_DIR}
48 NO_DEFAULT_PATH
49 )
50
51 FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
52- NAMES qdbuscpp2xml
53+ NAMES qdbuscpp2xml4 qdbuscpp2xml
54 PATHS ${QT_BINARY_DIR}
55 NO_DEFAULT_PATH
56 )
57
58 FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
59- NAMES qdbusxml2cpp
60+ NAMES qdbusxml2cpp4 qdbusxml2cpp
61 PATHS ${QT_BINARY_DIR}
62 NO_DEFAULT_PATH
63 )
64
65 FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
66- NAMES lupdate-qt4 lupdate
67+ NAMES lupdate-qt4 lupdate4 lupdate
68 PATHS ${QT_BINARY_DIR}
69 NO_DEFAULT_PATH
70 )
71
72 FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
73- NAMES lrelease-qt4 lrelease
74+ NAMES lrelease-qt4 lrelease4 lrelease
75 PATHS ${QT_BINARY_DIR}
76 NO_DEFAULT_PATH
77 )
78
79 FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
80- NAMES qcollectiongenerator-qt4 qcollectiongenerator
81+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
82 PATHS ${QT_BINARY_DIR}
83 NO_DEFAULT_PATH
84 )
85
86 FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
87- NAMES designer-qt4 designer
88+ NAMES designer-qt4 designer4 designer
89 PATHS ${QT_BINARY_DIR}
90 NO_DEFAULT_PATH
91 )
92
93 FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
94- NAMES linguist-qt4 linguist
95+ NAMES linguist-qt4 linguist4 linguist
96 PATHS ${QT_BINARY_DIR}
97 NO_DEFAULT_PATH
98 )