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

Merge topic 'no-explicit-usr-search' 

e93ac6f do not explicitely specify /usr and /usr/local as search paths
This commit is contained in:
David Cole 2012-06-21 11:54:02 -04:00 committed by CMake Topic Stage
parent cfaaa99375 e93ac6fbfe
commit 934f553f85
14 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindFLTK.cmake
View File

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

6
Modules/FindFLTK2.cmake
View File

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

6
Modules/FindLua50.cmake
View File

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

4
Modules/FindLua51.cmake
View File

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

4
Modules/FindOpenAL.cmake
View File

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

4
Modules/FindPhysFS.cmake
View File

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

4
Modules/FindProducer.cmake
View File

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

4
Modules/FindSDL_image.cmake
View File

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

4
Modules/FindSDL_mixer.cmake
View File

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

4
Modules/FindSDL_net.cmake
View File

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

20
Modules/FindSDL_sound.cmake
View File

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

4
Modules/FindSDL_ttf.cmake
View File

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

4
Modules/FindTCL.cmake
View File

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

2
Modules/FindTclStub.cmake
View File

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