1 --- cmake-2.8.12.1/Modules/FindFreetype.cmake.orig 2013-11-05 20:07:22.000000000 +0100
2 +++ cmake-2.8.12.1/Modules/FindFreetype.cmake 2013-12-06 19:50:19.371935997 +0100
4 PATH_SUFFIXES include/freetype2 include
7 -find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
8 +find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
14 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
15 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
16 - PATH_SUFFIXES include/freetype2 include
17 + PATH_SUFFIXES include/freetype2/freetype include/freetype2 include
20 find_library(FREETYPE_LIBRARY
23 # set the user variables
24 if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
25 - set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
26 + set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build}")
28 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
30 -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
31 - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
32 +if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
33 + file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
34 REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
36 unset(FREETYPE_VERSION_STRING)