diff options
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 | 70 |
1 files changed, 33 insertions, 37 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 0e311f70e3..15cbca89d8 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,11 +11,19 @@ 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.11/Modules/FindQt4.cmake | 14 | The patch was slightly adapted in order to match cmake 3.2.2: |
15 | =================================================================== | 15 | Instead of find_program, _find_qt4_program is now used. |
16 | --- cmake-2.8.11.orig/Modules/FindQt4.cmake | 16 | |
17 | +++ cmake-2.8.11/Modules/FindQt4.cmake | 17 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
18 | @@ -569,7 +569,7 @@ endfunction() | 18 | --- |
19 | Modules/FindQt4.cmake | 10 +++++----- | ||
20 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
21 | |||
22 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | ||
23 | index 11091b5..6704769 100644 | ||
24 | --- a/Modules/FindQt4.cmake | ||
25 | +++ b/Modules/FindQt4.cmake | ||
26 | @@ -522,7 +522,7 @@ endfunction() | ||
19 | 27 | ||
20 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | 28 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) |
21 | 29 | ||
@@ -23,36 +31,24 @@ Index: cmake-2.8.11/Modules/FindQt4.cmake | |||
23 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) | 31 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) |
24 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | 32 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) |
25 | 33 | ||
26 | if (QT_QMAKE_EXECUTABLE AND QTVERSION) | 34 | if (QT_QMAKE_EXECUTABLE AND |
27 | @@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | 35 | @@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND |
28 | ) | 36 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) |
29 | 37 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) | |
30 | find_program(QT_RCC_EXECUTABLE | 38 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) |
31 | - NAMES rcc | 39 | - _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc) |
32 | + NAMES rcc4 rcc | 40 | - _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml) |
33 | PATHS ${QT_BINARY_DIR} | 41 | - _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp) |
34 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | 42 | + _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc) |
35 | ) | 43 | + _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml) |
44 | + _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp) | ||
45 | _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate) | ||
46 | _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease) | ||
47 | - _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator) | ||
48 | + _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4) | ||
49 | _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) | ||
50 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) | ||
36 | 51 | ||
37 | find_program(QT_DBUSCPP2XML_EXECUTABLE | 52 | -- |
38 | - NAMES qdbuscpp2xml | 53 | 1.9.1 |
39 | + NAMES qdbuscpp2xml4 qdbuscpp2xml | 54 | |
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 | ) | ||