Browse Source

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
Alex Neundorf 14 years ago
parent
commit
f97620e733
2 changed files with 1 additions and 21 deletions
  1. 0 9
      Modules/FindFreetype.cmake
  2. 1 12
      Modules/FindGIF.cmake

+ 0 - 9
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
 )
 

+ 1 - 12
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
 )