kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Alex Neundorf 2011-07-27 20:34:09 +02:00
parent 7c38523470
commit f97620e733
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindFreetype.cmake
View File

@ -44,13 +44,9 @@
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
HINTS HINTS
$ENV{FREETYPE_DIR} $ENV{FREETYPE_DIR}
PATH_SUFFIXES include
PATHS PATHS
/usr/local/X11R6/include /usr/local/X11R6/include
/usr/local/X11/include /usr/local/X11/include
/usr/X11/include
/sw/include
/opt/local/include
/usr/freeware/include /usr/freeware/include
) )
@ -60,9 +56,6 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
PATHS PATHS
/usr/local/X11R6/include /usr/local/X11R6/include
/usr/local/X11/include /usr/local/X11/include
/usr/X11/include
/sw/include
/opt/local/include
/usr/freeware/include /usr/freeware/include
PATH_SUFFIXES freetype2 PATH_SUFFIXES freetype2
) )
@ -75,8 +68,6 @@ FIND_LIBRARY(FREETYPE_LIBRARY
PATHS PATHS
/usr/local/X11R6 /usr/local/X11R6
/usr/local/X11 /usr/local/X11
/usr/X11
/sw
/usr/freeware /usr/freeware
) )

13
Modules/FindGIF.cmake
View File

@ -28,10 +28,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /usr/freeware
/sw/include # Fink
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
/usr/freeware/include
) )
# the gif library can have many names :-/ # the gif library can have many names :-/
@ -44,14 +41,6 @@ FIND_LIBRARY(GIF_LIBRARY
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
PATHS PATHS
~/Library/Frameworks ~/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 /usr/freeware
) )