From e2ec3b671b3753da42df167ba1a4e496d08b5ce2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Jun 2008 16:04:06 -0400 Subject: 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. --- Modules/FindSDL_ttf.cmake | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Modules/FindSDL_ttf.cmake') diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake index e1113d6367..20d3e5af81 100644 --- a/Modules/FindSDL_ttf.cmake +++ b/Modules/FindSDL_ttf.cmake @@ -12,16 +12,11 @@ # module, but with modifications to recognize OS X frameworks and # additional Unix paths (FreeBSD, etc). - FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h - PATHS + HINTS $ENV{SDLTTFDIR} $ENV{SDLDIR} - NO_DEFAULT_PATH PATH_SUFFIXES include -) - -FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h PATHS ~/Library/Frameworks /Library/Frameworks @@ -45,15 +40,9 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h FIND_LIBRARY(SDLTTF_LIBRARY NAMES SDL_ttf - PATHS + HINTS $ENV{SDLTTFDIR} $ENV{SDLDIR} - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) - -FIND_LIBRARY(SDLTTF_LIBRARY - NAMES SDL_ttf PATHS ~/Library/Frameworks /Library/Frameworks -- cgit v1.2.1