diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-11 13:14:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-11 13:14:01 (GMT) |
| commit | 70c6eda8c2bf36aeaf83616c860c5a6563bd88f4 (patch) | |
| tree | 89c475356f2f14539943a052d70b363b432ca59d | |
| parent | 3d3adc0c5781860913c113a8b0fec6a9afc11ee4 (diff) | |
| parent | b79a1f67195f6bb7fddd52215f442f319139b531 (diff) | |
| download | CMake-70c6eda8c2bf36aeaf83616c860c5a6563bd88f4.zip CMake-70c6eda8c2bf36aeaf83616c860c5a6563bd88f4.tar.gz CMake-70c6eda8c2bf36aeaf83616c860c5a6563bd88f4.tar.bz2 | |
Merge topic 'FindFreetype-path-suffix-without-include'
b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
| -rw-r--r-- | Modules/FindFreetype.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 6f03c86..f0f9fe1 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -62,7 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ENV GTKMM_BASEPATH [HKEY_CURRENT_USER\\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 @@ -79,7 +79,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 ENV GTKMM_BASEPATH [HKEY_CURRENT_USER\\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 |