From ef5be684eda4f97efba5964778d0381bb2cea118 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 8 Apr 2014 19:42:05 +0000 Subject: [PATCH] Added extra search paths to add compatibility with Kubuntu/Ubuntu 14.04 now locaton for freetype --- CMakeModules/FindFreeType.cmake | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CMakeModules/FindFreeType.cmake b/CMakeModules/FindFreeType.cmake index 0e16dd44a..ac26dca9a 100644 --- a/CMakeModules/FindFreeType.cmake +++ b/CMakeModules/FindFreeType.cmake @@ -48,7 +48,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h /opt/csw /opt /usr/freeware - PATH_SUFFIXES include + PATH_SUFFIXES include include/freetype2 ) FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h @@ -74,6 +74,20 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/freeware/include/freetype2 ) +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + /usr/local/include/freetype2 + /usr/include/freetype2 + /usr/local/X11R6/include/freetype2 + /usr/local/X11/include/freetype2 + /usr/X11R6/include/freetype2 + /usr/X11/include/freetype2 + /sw/include/freetype2 + /opt/local/include/freetype2 + /opt/csw/include/freetype2 + /opt/include/freetype2 + /usr/freeware/include/freetype2 +) + FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 PATHS