24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
|
diff -Nru cmake-2.8.12.1.orig/Modules/FindFreetype.cmake cmake-2.8.12.1/Modules/FindFreetype.cmake
|
||
|
|
--- cmake-2.8.12.1.orig/Modules/FindFreetype.cmake 2013-11-05 20:07:22.000000000 +0100
|
||
|
|
+++ cmake-2.8.12.1/Modules/FindFreetype.cmake 2013-11-30 19:40:16.007470855 +0100
|
||
|
|
@@ -56,7 +56,7 @@
|
||
|
|
PATH_SUFFIXES include/freetype2 include
|
||
|
|
)
|
||
|
|
|
||
|
|
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
|
||
|
|
+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
|
||
|
|
HINTS
|
||
|
|
ENV FREETYPE_DIR
|
||
|
|
PATHS
|
||
|
|
@@ -91,8 +91,8 @@
|
||
|
|
endif()
|
||
|
|
set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
|
||
|
|
|
||
|
|
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
||
|
|
- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
|
||
|
|
+if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
||
|
|
+ file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
|
||
|
|
REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
|
||
|
|
|
||
|
|
unset(FREETYPE_VERSION_STRING)
|