Sfoglia il codice sorgente

do not explicitely specify /usr and /usr/local as search paths

If not explicitely excluded these paths are searched automatically anyway.
Rolf Eike Beer 14 anni fa
parent
commit
e93ac6fbfe

+ 0 - 2
Modules/FindFLTK.cmake

@@ -105,8 +105,6 @@ IF(NOT FLTK_DIR)
     # Look in standard UNIX install locations.
     /usr/local/lib/fltk
     /usr/lib/fltk
-    /usr/local/include
-    /usr/include
     /usr/local/fltk
     /usr/X11R6/include
 

+ 0 - 6
Modules/FindFLTK2.cmake

@@ -85,8 +85,6 @@ IF(NOT FLTK2_DIR)
     # Look in standard UNIX install locations.
     /usr/local/lib/fltk2
     /usr/lib/fltk2
-    /usr/local/include
-    /usr/include
     /usr/local/fltk2
     /usr/X11R6/include
 
@@ -193,8 +191,6 @@ IF(FLTK2_DIR)
     ENDIF(FLTK2_FLUID_EXECUTABLE)
 
     SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
-      /usr/local/include
-      /usr/include
       /usr/local/fltk2
       /usr/X11R6/include
       )
@@ -202,8 +198,6 @@ IF(FLTK2_DIR)
     FIND_PATH(FLTK2_INCLUDE_DIR fltk/run.h ${FLTK2_INCLUDE_SEARCH_PATH})
 
     SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
-      /usr/lib
-      /usr/local/lib
       /usr/local/fltk2/lib
       /usr/X11R6/lib
       ${FLTK2_INCLUDE_DIR}/lib

+ 0 - 6
Modules/FindLua50.cmake

@@ -31,8 +31,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
@@ -47,8 +45,6 @@ FIND_LIBRARY(LUA_LIBRARY_lua
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw
@@ -67,8 +63,6 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
     $ENV{LUA_DIR}
     PATH_SUFFIXES lib64 lib
     PATHS
-    /usr/local
-    /usr
     /sw
     /opt/local
     /opt/csw

+ 0 - 4
Modules/FindLua51.cmake

@@ -32,8 +32,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
@@ -48,8 +46,6 @@ FIND_LIBRARY(LUA_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindOpenAL.cmake

@@ -68,8 +68,6 @@ FIND_PATH(OPENAL_INCLUDE_DIR al.h
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
@@ -85,8 +83,6 @@ FIND_LIBRARY(OPENAL_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindPhysFS.cmake

@@ -30,8 +30,6 @@ FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
@@ -46,8 +44,6 @@ FIND_LIBRARY(PHYSFS_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindProducer.cmake

@@ -51,8 +51,6 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
   PATHS
     ~/Library/Frameworks
     /Library/Frameworks
-    /usr/local/include
-    /usr/include
     /sw/include # Fink
     /opt/local/include # DarwinPorts
     /opt/csw/include # Blastwave
@@ -69,8 +67,6 @@ FIND_LIBRARY(PRODUCER_LIBRARY
   $ENV{OSGDIR}
   PATH_SUFFIXES lib64 lib
   PATHS
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindSDL_image.cmake

@@ -39,8 +39,6 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /usr/local/include
-  /usr/include
   /sw/include/SDL # Fink
   /sw/include
   /opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindSDL_mixer.cmake

@@ -39,8 +39,6 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /usr/local/include
-  /usr/include
   /sw/include/SDL # Fink
   /sw/include
   /opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLMIXER_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindSDL_net.cmake

@@ -39,8 +39,6 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /usr/local/include
-  /usr/include
   /sw/include/SDL # Fink
   /sw/include
   /opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLNET_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 20
Modules/FindSDL_sound.cmake

@@ -86,8 +86,6 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /usr/local/include
-  /usr/include
   /sw/include/SDL # Fink
   /sw/include
   /opt/local/include/SDL # DarwinPorts
@@ -106,8 +104,6 @@ FIND_LIBRARY(SDL_SOUND_LIBRARY
   $ENV{SDLDIR}/lib
   $ENV{SDLDIR}
   PATHS
-  /usr/local/lib
-  /usr/lib
   /sw/lib
   /opt/local/lib
   /opt/csw/lib
@@ -222,8 +218,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -245,8 +239,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -271,8 +263,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -293,8 +283,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -317,8 +305,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -341,8 +327,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -368,8 +352,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
          $ENV{SDLSOUNDDIR}
          $ENV{SDLDIR}/lib
          $ENV{SDLDIR}
-         /usr/local/lib
-         /usr/lib
          /sw/lib
          /opt/local/lib
          /opt/csw/lib
@@ -395,8 +377,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
            $ENV{SDLSOUNDDIR}
            $ENV{SDLDIR}/lib
            $ENV{SDLDIR}
-           /usr/local/lib
-           /usr/lib
            /sw/lib
            /opt/local/lib
            /opt/csw/lib

+ 0 - 4
Modules/FindSDL_ttf.cmake

@@ -39,8 +39,6 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
   /usr/local/include/SDL11 # FreeBSD ports
   /usr/include/SDL12
   /usr/include/SDL11
-  /usr/local/include
-  /usr/include
   /sw/include/SDL # Fink
   /sw/include
   /opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLTTF_LIBRARY
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
-  /usr/local
-  /usr
   /sw
   /opt/local
   /opt/csw

+ 0 - 4
Modules/FindTCL.cmake

@@ -82,8 +82,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
   "${TK_LIBRARY_PATH}"
   "${TCL_TCLSH_PATH_PARENT}/lib"
   "${TK_WISH_PATH_PARENT}/lib"
-  /usr/lib 
-  /usr/local/lib
   )
 
 IF(WIN32)
@@ -162,8 +160,6 @@ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
   ${TK_FRAMEWORK_INCLUDES} 
   "${TCL_TCLSH_PATH_PARENT}/include"
   "${TK_WISH_PATH_PARENT}/include"
-  /usr/include
-  /usr/local/include
   /usr/include/tcl${TK_LIBRARY_VERSION}
   /usr/include/tcl${TCL_LIBRARY_VERSION}
   /usr/include/tcl8.6

+ 0 - 2
Modules/FindTclStub.cmake

@@ -66,8 +66,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
   "${TK_LIBRARY_PATH}"
   "${TCL_TCLSH_PATH_PARENT}/lib"
   "${TK_WISH_PATH_PARENT}/lib"
-  /usr/lib 
-  /usr/local/lib
 )
 
 IF(WIN32)