summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
diff options
context:
space:
mode:
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.patch47
1 files changed, 47 insertions, 0 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
new file mode 100644
index 0000000..1b523c0
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch
@@ -0,0 +1,47 @@
1From: Julian Ospald <hasufell@gentoo.org>
2Date: Sun Dec 8 13:38:06 UTC 2013
3Subject: fix check for freetype-2.5.1
4
5Upstream-Status: Submitted http://www.cmake.org/Bug/view.php?id=14601
6
7Signed-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)