Merge topic 'FindFreetype-path-suffix-without-include'

b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
This commit is contained in:
Brad King 2014-03-11 09:14:01 -04:00 committed by CMake Topic Stage
commit 70c6eda8c2
1 changed files with 2 additions and 2 deletions

View File

@ -62,7 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
ENV GTKMM_BASEPATH ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
PATH_SUFFIXES include/freetype2 include PATH_SUFFIXES include/freetype2 include freetype2
) )
find_path(FREETYPE_INCLUDE_DIR_freetype2 find_path(FREETYPE_INCLUDE_DIR_freetype2
@ -79,7 +79,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
ENV GTKMM_BASEPATH ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
PATH_SUFFIXES include/freetype2 include PATH_SUFFIXES include/freetype2 include freetype2
) )
find_library(FREETYPE_LIBRARY find_library(FREETYPE_LIBRARY