diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-05-20 19:20:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 14:14:42 +0100 |
commit | 24380e2be91e08fa5d33a81488c0a48e2576e51a (patch) | |
tree | b2f030a139af603eedb9fdc2dabb6eb7866508f9 /meta/recipes-devtools/cmake/cmake | |
parent | 26147b2aae329c896b3a6546bb079e8759c10184 (diff) | |
download | poky-24380e2be91e08fa5d33a81488c0a48e2576e51a.tar.gz |
cmake: Update to 2.8.11
Rebased support-oe-qt4-tools-names as some of the changes where
added in the upstream code.
(From OE-Core rev: 13399264e987b698b120688dc5018adb3fa8522d)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | 70 |
1 files changed, 14 insertions, 56 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 index 258971b8a4..0e311f70e3 100644 --- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -11,36 +11,20 @@ Upstream-Status: Inappropriate [embedded specific] | |||
11 | 11 | ||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
13 | 13 | ||
14 | Index: cmake-2.8.10.1/Modules/FindQt4.cmake | 14 | Index: cmake-2.8.11/Modules/FindQt4.cmake |
15 | =================================================================== | 15 | =================================================================== |
16 | --- cmake-2.8.10.1.orig/Modules/FindQt4.cmake | 16 | --- cmake-2.8.11.orig/Modules/FindQt4.cmake |
17 | +++ cmake-2.8.10.1/Modules/FindQt4.cmake | 17 | +++ cmake-2.8.11/Modules/FindQt4.cmake |
18 | @@ -497,7 +497,7 @@ get_filename_component(qt_install_versio | 18 | @@ -569,7 +569,7 @@ endfunction() |
19 | # check for qmake | ||
20 | # Debian uses qmake-qt4 | ||
21 | # macports' Qt uses qmake-mac | ||
22 | -find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac | ||
23 | +find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac | ||
24 | PATHS | ||
25 | ENV QTDIR | ||
26 | "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" | ||
27 | @@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
28 | endif() | ||
29 | 19 | ||
30 | find_program(QT_MOC_EXECUTABLE | 20 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) |
31 | - NAMES moc-qt4 moc | ||
32 | + NAMES moc-qt4 moc4 moc | ||
33 | PATHS ${QT_BINARY_DIR} | ||
34 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
35 | ) | ||
36 | 21 | ||
37 | find_program(QT_UIC_EXECUTABLE | 22 | -set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) |
38 | - NAMES uic-qt4 uic | 23 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) |
39 | + NAMES uic-qt4 uic4 uic | 24 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) |
40 | PATHS ${QT_BINARY_DIR} | 25 | |
41 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | 26 | if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
42 | ) | 27 | @@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
43 | @@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
44 | ) | 28 | ) |
45 | 29 | ||
46 | find_program(QT_RCC_EXECUTABLE | 30 | find_program(QT_RCC_EXECUTABLE |
@@ -59,42 +43,16 @@ Index: cmake-2.8.10.1/Modules/FindQt4.cmake | |||
59 | 43 | ||
60 | find_program(QT_DBUSXML2CPP_EXECUTABLE | 44 | find_program(QT_DBUSXML2CPP_EXECUTABLE |
61 | - NAMES qdbusxml2cpp | 45 | - NAMES qdbusxml2cpp |
62 | + NAMES qdbusxml2cpp4 qdbusxml2cpp | 46 | + NAMES qdbusxml2cp4 qdbusxml2cpp |
63 | PATHS ${QT_BINARY_DIR} | ||
64 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
65 | ) | ||
66 | |||
67 | find_program(QT_LUPDATE_EXECUTABLE | ||
68 | - NAMES lupdate-qt4 lupdate | ||
69 | + NAMES lupdate-qt4 lupdate4 lupdate | ||
70 | PATHS ${QT_BINARY_DIR} | 47 | PATHS ${QT_BINARY_DIR} |
71 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | 48 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
72 | ) | 49 | ) |
73 | 50 | @@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | |
74 | find_program(QT_LRELEASE_EXECUTABLE | ||
75 | - NAMES lrelease-qt4 lrelease | ||
76 | + NAMES lrelease-qt4 lrelease4 lrelease | ||
77 | PATHS ${QT_BINARY_DIR} | ||
78 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
79 | ) | 51 | ) |
80 | 52 | ||
81 | find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE | 53 | find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE |
82 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator | 54 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator |
83 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator | 55 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4 |
84 | PATHS ${QT_BINARY_DIR} | ||
85 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
86 | ) | ||
87 | |||
88 | find_program(QT_DESIGNER_EXECUTABLE | ||
89 | - NAMES designer-qt4 designer | ||
90 | + NAMES designer-qt4 designer4 designer | ||
91 | PATHS ${QT_BINARY_DIR} | ||
92 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
93 | ) | ||
94 | |||
95 | find_program(QT_LINGUIST_EXECUTABLE | ||
96 | - NAMES linguist-qt4 linguist | ||
97 | + NAMES linguist-qt4 linguist4 linguist | ||
98 | PATHS ${QT_BINARY_DIR} | 56 | PATHS ${QT_BINARY_DIR} |
99 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | 57 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
100 | ) | 58 | ) |