Annotation of /trunk/cmake/patches/cmake-2.8.12.1-freetype252.patch
Parent Directory | Revision Log
Revision 2354 -
(hide annotations)
(download)
Thu Dec 19 08:38:43 2013 UTC (10 years, 9 months ago) by niro
File size: 1023 byte(s)
Thu Dec 19 08:38:43 2013 UTC (10 years, 9 months ago) by niro
File size: 1023 byte(s)
-fixed detection of freetype-2.5.2
1 | niro | 2354 | diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake |
2 | index 179dc00..0f5a2b4 100644 | ||
3 | --- a/Modules/FindFreetype.cmake | ||
4 | +++ b/Modules/FindFreetype.cmake | ||
5 | @@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h | ||
6 | ENV GTKMM_BASEPATH | ||
7 | [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] | ||
8 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] | ||
9 | - PATH_SUFFIXES include/freetype2 include | ||
10 | + PATH_SUFFIXES include/freetype2 include/freetype include | ||
11 | ) | ||
12 | |||
13 | -find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h | ||
14 | +find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h | ||
15 | HINTS | ||
16 | ENV FREETYPE_DIR | ||
17 | PATHS | ||
18 | @@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h | ||
19 | ENV GTKMM_BASEPATH | ||
20 | [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] | ||
21 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] | ||
22 | - PATH_SUFFIXES include/freetype2 include | ||
23 | + PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype | ||
24 | ) | ||
25 | |||
26 | find_library(FREETYPE_LIBRARY |