diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-07-27 20:34:09 +0200 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-07-27 20:34:09 +0200 |
| commit | f97620e733a0939046b5b098da3451b20fd26c96 (patch) | |
| tree | 1b6aaa001bfb1767dc7cb5f8066e822e181ff336 /Modules | |
| parent | 7c3852347082a4a0fbeab747d0ec975b72a13c27 (diff) | |
| download | cmake-f97620e733a0939046b5b098da3451b20fd26c96.tar.gz | |
FindGIF/FindFreetype.cmake: remove standard search paths from find-calls
In both files find_path() and find_library() are called with multiple
additional search PATHS which are already anyway part of the default
search dirs, so it should be safe to remove them.
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFreetype.cmake | 9 | ||||
| -rw-r--r-- | Modules/FindGIF.cmake | 13 |
2 files changed, 1 insertions, 21 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index d6cac755a8..6251805df8 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -44,13 +44,9 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h HINTS $ENV{FREETYPE_DIR} - PATH_SUFFIXES include PATHS /usr/local/X11R6/include /usr/local/X11/include - /usr/X11/include - /sw/include - /opt/local/include /usr/freeware/include ) @@ -60,9 +56,6 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h PATHS /usr/local/X11R6/include /usr/local/X11/include - /usr/X11/include - /sw/include - /opt/local/include /usr/freeware/include PATH_SUFFIXES freetype2 ) @@ -75,8 +68,6 @@ FIND_LIBRARY(FREETYPE_LIBRARY PATHS /usr/local/X11R6 /usr/local/X11 - /usr/X11 - /sw /usr/freeware ) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 43802ccb1d..01253466fa 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -28,10 +28,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h PATH_SUFFIXES include PATHS ~/Library/Frameworks - /Library/Frameworks - /sw/include # Fink - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include - /usr/freeware/include + /usr/freeware ) # the gif library can have many names :-/ @@ -44,14 +41,6 @@ FIND_LIBRARY(GIF_LIBRARY PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware ) |