[PATCH] Fix finding freetype in Ubuntu 14.04

scrawl

27-04-2014 09:35:16

In Ubuntu 14.04, the freetype header is in /usr/include/freetype2/freetype.h. MyGUI's FindFreetype.cmake fails to find it because it only looks for freetype/freetype.h

Please merge this patch.

Index: CMake/Packages/FindFreetype.cmake
===================================================================
--- CMake/Packages/FindFreetype.cmake (revision 5296)
+++ CMake/Packages/FindFreetype.cmake (working copy)
@@ -33,7 +33,7 @@
findpkg_framework(FREETYPE)
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")

-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h freetype2/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)

Altren

27-04-2014 23:57:32

I just committed updated version from Ogre's repository. It is not same as yours version. Could you check if it works for you?

scrawl

28-04-2014 04:42:57

Yes, that appears to work as well. Thanks!