Merge topic 'FindSDL-consistent-path-suffixes'
d71db3a0
FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
This commit is contained in:
commit
3d3adc0c57
|
@ -54,7 +54,9 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
|
||||||
HINTS
|
HINTS
|
||||||
ENV SDLIMAGEDIR
|
ENV SDLIMAGEDIR
|
||||||
ENV SDLDIR
|
ENV SDLDIR
|
||||||
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
|
PATH_SUFFIXES SDL
|
||||||
|
# path suffixes to search inside ENV{SDLDIR}
|
||||||
|
include/SDL include/SDL12 include/SDL11 include
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
|
|
@ -54,7 +54,9 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
|
||||||
HINTS
|
HINTS
|
||||||
ENV SDLMIXERDIR
|
ENV SDLMIXERDIR
|
||||||
ENV SDLDIR
|
ENV SDLDIR
|
||||||
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
|
PATH_SUFFIXES SDL
|
||||||
|
# path suffixes to search inside ENV{SDLDIR}
|
||||||
|
include/SDL include/SDL12 include/SDL11 include
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
|
|
@ -54,7 +54,9 @@ find_path(SDL_NET_INCLUDE_DIR SDL_net.h
|
||||||
HINTS
|
HINTS
|
||||||
ENV SDLNETDIR
|
ENV SDLNETDIR
|
||||||
ENV SDLDIR
|
ENV SDLDIR
|
||||||
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
|
PATH_SUFFIXES SDL
|
||||||
|
# path suffixes to search inside ENV{SDLDIR}
|
||||||
|
include/SDL include/SDL12 include/SDL11 include
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
|
|
@ -98,7 +98,9 @@ find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
|
||||||
HINTS
|
HINTS
|
||||||
ENV SDLSOUNDDIR
|
ENV SDLSOUNDDIR
|
||||||
ENV SDLDIR
|
ENV SDLDIR
|
||||||
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
|
PATH_SUFFIXES SDL
|
||||||
|
# path suffixes to search inside ENV{SDLDIR}
|
||||||
|
include/SDL include/SDL12 include/SDL11 include
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(SDL_SOUND_LIBRARY
|
find_library(SDL_SOUND_LIBRARY
|
||||||
|
|
|
@ -54,7 +54,9 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
|
||||||
HINTS
|
HINTS
|
||||||
ENV SDLTTFDIR
|
ENV SDLTTFDIR
|
||||||
ENV SDLDIR
|
ENV SDLDIR
|
||||||
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
|
PATH_SUFFIXES SDL
|
||||||
|
# path suffixes to search inside ENV{SDLDIR}
|
||||||
|
include/SDL include/SDL12 include/SDL11 include
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
|
Loading…
Reference in New Issue