diff options
author | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
commit | e2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch) | |
tree | fe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/FindFreetype.cmake | |
parent | 05434489079708e9896d03b7fc9153ded1d960b4 (diff) | |
download | CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.zip CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.gz CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.bz2 |
ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option.
- The option specifies paths to be preferred over the system paths.
- Many Find* modules were using two find calls with NO_DEFAULT_PATH
to approximate the behavior, but that blocked users from overriding
things with CMAKE_PREFIX_PATH.
- This commit uses the HINTS feature to get desired behavior in
only one find command call.
Diffstat (limited to 'Modules/FindFreetype.cmake')
-rw-r--r-- | Modules/FindFreetype.cmake | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index c128c47..3c83bfa 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -29,13 +29,9 @@ # I'm going to attempt to cut out the middleman and hope # everything still works. FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h + HINTS $ENV{FREETYPE_DIR} - NO_DEFAULT_PATH PATH_SUFFIXES include -) - - -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATHS /usr/local/X11R6/include /usr/local/X11/include @@ -46,11 +42,9 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ) FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + HINTS $ENV{FREETYPE_DIR}/include/freetype2 - NO_DEFAULT_PATH -) - -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + PATHS /usr/local/X11R6/include /usr/local/X11/include /usr/X11/include @@ -62,21 +56,15 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 - PATHS + HINTS $ENV{FREETYPE_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) - -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 + PATH_SUFFIXES lib64 lib PATHS /usr/local/X11R6 /usr/local/X11 /usr/X11 /sw /usr/freeware - PATH_SUFFIXES lib64 lib ) # set the user variables |