diff options
author | Moritz Blume <moritz.blume@bmw-carit.de> | 2015-06-23 17:50:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-27 22:42:52 +0100 |
commit | f8661aaeba4d4b1fb328106c36493a5019b59110 (patch) | |
tree | 2f5c59382170793a857e74bc974f8beb49aeaa3e /meta/recipes-devtools/cmake/cmake | |
parent | b053b81e68573f5b5822a3b61f8fdd4d0d366442 (diff) | |
download | poky-f8661aaeba4d4b1fb328106c36493a5019b59110.tar.gz |
cmake: Upgrade 2.8.12.2 -> 3.2.2
Patches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch"
were adapted in order to fit to CMake 3.2.2 (refer to the commit
message in the respective patch for details).
Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was
rejected upstream and its functionality otherwise implemented in the
meantime.
(From OE-Core rev: c171909352b5ed92166857b0bbcd901ae0f74996)
Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
3 files changed, 59 insertions, 88 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch deleted file mode 100644 index 1b523c057b..0000000000 --- a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From: Julian Ospald <hasufell@gentoo.org> | ||
2 | Date: Sun Dec 8 13:38:06 UTC 2013 | ||
3 | Subject: fix check for freetype-2.5.1 | ||
4 | |||
5 | Upstream-Status: Submitted http://www.cmake.org/Bug/view.php?id=14601 | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | |||
9 | --- old/Modules/FindFreetype.cmake | ||
10 | +++ new/Modules/FindFreetype.cmake | ||
11 | @@ -64,6 +64,19 @@ | ||
12 | PATH_SUFFIXES include/freetype2 include | ||
13 | ) | ||
14 | |||
15 | +if(NOT FREETYPE_INCLUDE_DIR_freetype2) | ||
16 | + find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h | ||
17 | + HINTS | ||
18 | + ENV FREETYPE_DIR | ||
19 | + PATHS | ||
20 | + /usr/X11R6 | ||
21 | + /usr/local/X11R6 | ||
22 | + /usr/local/X11 | ||
23 | + /usr/freeware | ||
24 | + PATH_SUFFIXES include/freetype2 include | ||
25 | + ) | ||
26 | +endif() | ||
27 | + | ||
28 | find_library(FREETYPE_LIBRARY | ||
29 | NAMES freetype libfreetype freetype219 | ||
30 | HINTS | ||
31 | @@ -82,8 +95,14 @@ | ||
32 | endif() | ||
33 | set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") | ||
34 | |||
35 | -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
36 | - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str | ||
37 | +if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
38 | + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
39 | +elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") | ||
40 | + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") | ||
41 | +endif() | ||
42 | + | ||
43 | +if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) | ||
44 | + file(STRINGS "${FREETYPE_H}" freetype_version_str | ||
45 | REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") | ||
46 | |||
47 | unset(FREETYPE_VERSION_STRING) | ||
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch index fd39f3f9e7..80fc277fa2 100644 --- a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch +++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch | |||
@@ -13,10 +13,21 @@ Upstream-Status: Pending | |||
13 | 13 | ||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
15 | 15 | ||
16 | --- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100 | 16 | The patch was slightly adapted in order to match cmake 3.2.2: |
17 | +++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100 | 17 | Another set_property was introduced which had to be included |
18 | @@ -1025,21 +1025,22 @@ | 18 | within the if(QT_QTCORE_FOUND) statement. |
19 | set(_configs) | 19 | |
20 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | ||
21 | --- | ||
22 | Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- | ||
23 | 1 file changed, 20 insertions(+), 19 deletions(-) | ||
24 | |||
25 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | ||
26 | index 6704769..9048e35 100644 | ||
27 | --- a/Modules/FindQt4.cmake | ||
28 | +++ b/Modules/FindQt4.cmake | ||
29 | @@ -1000,25 +1000,26 @@ if (QT_QMAKE_EXECUTABLE AND | ||
30 | endif() | ||
20 | endmacro() | 31 | endmacro() |
21 | 32 | ||
22 | - | 33 | - |
@@ -28,6 +39,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
28 | - "${QT_MKSPECS_DIR}/default" | 39 | - "${QT_MKSPECS_DIR}/default" |
29 | - ${QT_INCLUDE_DIR} | 40 | - ${QT_INCLUDE_DIR} |
30 | - ) | 41 | - ) |
42 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
43 | - INTERFACE_COMPILE_DEFINITIONS | ||
44 | - $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> | ||
45 | - ) | ||
31 | - set_property(TARGET Qt4::QtCore PROPERTY | 46 | - set_property(TARGET Qt4::QtCore PROPERTY |
32 | - INTERFACE_QT_MAJOR_VERSION 4 | 47 | - INTERFACE_QT_MAJOR_VERSION 4 |
33 | - ) | 48 | - ) |
@@ -43,6 +58,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
43 | + "${QT_MKSPECS_DIR}/default" | 58 | + "${QT_MKSPECS_DIR}/default" |
44 | + ${QT_INCLUDE_DIR} | 59 | + ${QT_INCLUDE_DIR} |
45 | + ) | 60 | + ) |
61 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
62 | + INTERFACE_COMPILE_DEFINITIONS | ||
63 | + $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> | ||
64 | + ) | ||
46 | + set_property(TARGET Qt4::QtCore PROPERTY | 65 | + set_property(TARGET Qt4::QtCore PROPERTY |
47 | + INTERFACE_QT_MAJOR_VERSION 4 | 66 | + INTERFACE_QT_MAJOR_VERSION 4 |
48 | + ) | 67 | + ) |
@@ -53,3 +72,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
53 | 72 | ||
54 | foreach(QT_MODULE ${QT_MODULES}) | 73 | foreach(QT_MODULE ${QT_MODULES}) |
55 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) | 74 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) |
75 | -- | ||
76 | 1.9.1 | ||
77 | |||
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 | ) | ||