diff options
| author | Brad King <brad.king@kitware.com> | 2012-09-11 19:01:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-11 19:01:25 (GMT) |
| commit | 53568bd9b5181cfcc2acd2051f922cc2ecd83afa (patch) | |
| tree | 0751cb30af34721f8e2358cf4333b1925f5f838f /Modules | |
| parent | 6a6e2eda118e4c94e67d92d06f7463f503e647db (diff) | |
| parent | 9d91fc65fa955d6ba878a4f72a93a004b02af2a5 (diff) | |
| download | CMake-53568bd9b5181cfcc2acd2051f922cc2ecd83afa.zip CMake-53568bd9b5181cfcc2acd2051f922cc2ecd83afa.tar.gz CMake-53568bd9b5181cfcc2acd2051f922cc2ecd83afa.tar.bz2 | |
Merge topic 'findfreetype-13502'
9d91fc6 fix for discovering ft2build.h using FREETYPE_DIR environment var (#13502)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFreetype.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index c7cf0eb..cdb46be 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -46,9 +46,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h HINTS ENV FREETYPE_DIR PATHS - /usr/local/X11R6/include - /usr/local/X11/include - /usr/freeware/include + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + PATH_SUFFIXES include/freetype2 include ) find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h |