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/cmake-2.8.11.2-FindFreetype.patch | |
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/cmake-2.8.11.2-FindFreetype.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | 47 |
1 files changed, 0 insertions, 47 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) | ||