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

FindSDL: Remove from find_... calls PATHS that are set by default 

Use PATH_SUFFIXES to add SDL parts to standard paths.
This commit is contained in:
Benjamin Eikel 2012-09-04 17:20:37 +02:00 committed by Brad King
parent 38a0f71574
commit 9ed24c5316
6 changed files with 7 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindSDL.cmake
View File

@ -70,18 +70,7 @@
find_path(SDL_INCLUDE_DIR SDL.h find_path(SDL_INCLUDE_DIR SDL.h
HINTS HINTS
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES include/SDL include PATH_SUFFIXES SDL SDL12 SDL11
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
# SDL-1.1 is the name used by FreeBSD ports... # SDL-1.1 is the name used by FreeBSD ports...
@ -90,12 +79,6 @@ find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1 NAMES SDL SDL-1.1
HINTS HINTS
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES lib
PATHS
/sw
/opt/local
/opt/csw
/opt
) )
if(NOT SDL_BUILDING_LIBRARY) if(NOT SDL_BUILDING_LIBRARY)

21
Modules/FindSDL_image.cmake
View File

@ -36,18 +36,7 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
HINTS HINTS
ENV SDLIMAGEDIR ENV SDLIMAGEDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES include include/SDL PATH_SUFFIXES SDL SDL12 SDL11
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
find_library(SDL_IMAGE_LIBRARY find_library(SDL_IMAGE_LIBRARY
@ -55,14 +44,6 @@ find_library(SDL_IMAGE_LIBRARY
HINTS HINTS
ENV SDLIMAGEDIR ENV SDLIMAGEDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw
/opt/local
/opt/csw
/opt
) )
if(SDL_IMAGE_INCLUDE_DIR AND EXISTS "${SDL_IMAGE_INCLUDE_DIR}/SDL_image.h") if(SDL_IMAGE_INCLUDE_DIR AND EXISTS "${SDL_IMAGE_INCLUDE_DIR}/SDL_image.h")

21
Modules/FindSDL_mixer.cmake
View File

@ -36,18 +36,7 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
HINTS HINTS
ENV SDLMIXERDIR ENV SDLMIXERDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES include include/SDL PATH_SUFFIXES SDL SDL12 SDL11
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
find_library(SDL_MIXER_LIBRARY find_library(SDL_MIXER_LIBRARY
@ -55,14 +44,6 @@ find_library(SDL_MIXER_LIBRARY
HINTS HINTS
ENV SDLMIXERDIR ENV SDLMIXERDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw
/opt/local
/opt/csw
/opt
) )
if(SDL_MIXER_INCLUDE_DIR AND EXISTS "${SDL_MIXER_INCLUDE_DIR}/SDL_mixer.h") if(SDL_MIXER_INCLUDE_DIR AND EXISTS "${SDL_MIXER_INCLUDE_DIR}/SDL_mixer.h")

22
Modules/FindSDL_net.cmake
View File

@ -36,32 +36,14 @@ find_path(SDL_NET_INCLUDE_DIR SDL_net.h
HINTS HINTS
ENV SDLNETDIR ENV SDLNETDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES include include/SDL PATH_SUFFIXES SDL SDL12 SDL11
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
find_library(SDL_NET_LIBRARY find_library(SDL_NET_LIBRARY
NAMES SDL_net NAMES SDL_net
HINTS HINTS
ENV SDLNETDIR ENV SDLNETDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw
/opt/local
/opt/csw
/opt
) )
if(SDL_NET_INCLUDE_DIR AND EXISTS "${SDL_NET_INCLUDE_DIR}/SDL_net.h") if(SDL_NET_INCLUDE_DIR AND EXISTS "${SDL_NET_INCLUDE_DIR}/SDL_net.h")

19
Modules/FindSDL_sound.cmake
View File

@ -77,17 +77,7 @@ find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
HINTS HINTS
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES PATH_SUFFIXES SDL SDL12 SDL11
include include/SDL
PATHS
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
find_library(SDL_SOUND_LIBRARY find_library(SDL_SOUND_LIBRARY
@ -95,13 +85,6 @@ find_library(SDL_SOUND_LIBRARY
HINTS HINTS
ENV SDLSOUNDDIR ENV SDLSOUNDDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES
lib
PATHS
/sw
/opt/local
/opt/csw
/opt
) )
if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY) if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)

21
Modules/FindSDL_ttf.cmake
View File

@ -36,18 +36,7 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
HINTS HINTS
ENV SDLTTFDIR ENV SDLTTFDIR
ENV SDLDIR ENV SDLDIR
PATH_SUFFIXES include include/SDL PATH_SUFFIXES SDL SDL12 SDL11
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
find_library(SDL_TTF_LIBRARY find_library(SDL_TTF_LIBRARY
@ -55,14 +44,6 @@ find_library(SDL_TTF_LIBRARY
HINTS HINTS
ENV SDLTTFDIR ENV SDLTTFDIR
ENV SDLDIR ENV SDLDIR
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw
/opt/local
/opt/csw
/opt
PATH_SUFFIXES lib
) )
if(SDL_TTF_INCLUDE_DIR AND EXISTS "${SDL_TTF_INCLUDE_DIR}/SDL_ttf.h") if(SDL_TTF_INCLUDE_DIR AND EXISTS "${SDL_TTF_INCLUDE_DIR}/SDL_ttf.h")