BUG: Fix include path detection with SDLDIR env var (issue #9086).
Also removed some superfluous search paths.
This commit is contained in:
parent
cff19fc2dc
commit
1c794c0438
@ -55,26 +55,18 @@
|
|||||||
FIND_PATH(SDL_INCLUDE_DIR SDL.h
|
FIND_PATH(SDL_INCLUDE_DIR SDL.h
|
||||||
HINTS
|
HINTS
|
||||||
$ENV{SDLDIR}
|
$ENV{SDLDIR}
|
||||||
PATH_SUFFIXES include
|
PATH_SUFFIXES include/SDL include
|
||||||
PATHS
|
PATHS
|
||||||
~/Library/Frameworks
|
~/Library/Frameworks
|
||||||
/Library/Frameworks
|
/Library/Frameworks
|
||||||
/usr/local/include/SDL
|
|
||||||
/usr/include/SDL
|
|
||||||
/usr/local/include/SDL12
|
/usr/local/include/SDL12
|
||||||
/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
|
/sw # Fink
|
||||||
/usr/include
|
/opt/local # DarwinPorts
|
||||||
/sw/include/SDL # Fink
|
/opt/csw # Blastwave
|
||||||
/sw/include
|
/opt
|
||||||
/opt/local/include/SDL # DarwinPorts
|
|
||||||
/opt/local/include
|
|
||||||
/opt/csw/include/SDL # Blastwave
|
|
||||||
/opt/csw/include
|
|
||||||
/opt/include/SDL
|
|
||||||
/opt/include
|
|
||||||
)
|
)
|
||||||
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
|
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
|
||||||
|
|
||||||
@ -86,8 +78,6 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
|
|||||||
$ENV{SDLDIR}
|
$ENV{SDLDIR}
|
||||||
PATH_SUFFIXES lib64 lib
|
PATH_SUFFIXES lib64 lib
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local
|
|
||||||
/usr
|
|
||||||
/sw
|
/sw
|
||||||
/opt/local
|
/opt/local
|
||||||
/opt/csw
|
/opt/csw
|
||||||
@ -108,8 +98,6 @@ IF(NOT SDL_BUILDING_LIBRARY)
|
|||||||
$ENV{SDLDIR}
|
$ENV{SDLDIR}
|
||||||
PATH_SUFFIXES lib64 lib
|
PATH_SUFFIXES lib64 lib
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local
|
|
||||||
/usr
|
|
||||||
/sw
|
/sw
|
||||||
/opt/local
|
/opt/local
|
||||||
/opt/csw
|
/opt/csw
|
||||||
|
Loading…
x
Reference in New Issue
Block a user