summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Eikel <cmake@eikel.org>2012-09-23 11:53:23 (GMT)
committerBrad King <brad.king@kitware.com>2012-09-25 17:56:04 (GMT)
commit68c6b134d0d994cacda7aa3cb92e930df42d6e23 (patch)
tree31660c1b67e7eb2f5ab18f44c46ccdbda8a19c3a
parent9ed24c5316fc4e9b56e3b491dee2f88b2cbb6f17 (diff)
downloadCMake-68c6b134d0d994cacda7aa3cb92e930df42d6e23.zip
CMake-68c6b134d0d994cacda7aa3cb92e930df42d6e23.tar.gz
CMake-68c6b134d0d994cacda7aa3cb92e930df42d6e23.tar.bz2
FindSDL: Stay compatible with old input variables
Suggested-by: David Cole <david.cole@kitware.com>
-rw-r--r--Modules/FindSDL_image.cmake8
-rw-r--r--Modules/FindSDL_mixer.cmake8
-rw-r--r--Modules/FindSDL_net.cmake8
-rw-r--r--Modules/FindSDL_ttf.cmake8
4 files changed, 32 insertions, 0 deletions
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index e3d5761..4cae032 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -32,6 +32,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if(NOT SDL_IMAGE_INCLUDE_DIR AND SDLIMAGE_INCLUDE_DIR)
+ set(SDL_IMAGE_INCLUDE_DIR ${SDLIMAGE_INCLUDE_DIR} CACHE PATH "directory cache
+entry initialized from old variable name")
+endif()
find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
HINTS
ENV SDLIMAGEDIR
@@ -39,6 +43,10 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
PATH_SUFFIXES SDL SDL12 SDL11
)
+if(NOT SDL_IMAGE_LIBRARY AND SDLIMAGE_LIBRARY)
+ set(SDL_IMAGE_LIBRARY ${SDLIMAGE_LIBRARY} CACHE FILEPATH "file cache entry
+initialized from old variable name")
+endif()
find_library(SDL_IMAGE_LIBRARY
NAMES SDL_image
HINTS
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index 61fe1ae..666fc6e 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -32,6 +32,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if(NOT SDL_MIXER_INCLUDE_DIR AND SDLMIXER_INCLUDE_DIR)
+ set(SDL_MIXER_INCLUDE_DIR ${SDLMIXER_INCLUDE_DIR} CACHE PATH "directory cache
+entry initialized from old variable name")
+endif()
find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
HINTS
ENV SDLMIXERDIR
@@ -39,6 +43,10 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
PATH_SUFFIXES SDL SDL12 SDL11
)
+if(NOT SDL_MIXER_LIBRARY AND SDLMIXER_LIBRARY)
+ set(SDL_MIXER_LIBRARY ${SDLMIXER_LIBRARY} CACHE FILEPATH "file cache entry
+initialized from old variable name")
+endif()
find_library(SDL_MIXER_LIBRARY
NAMES SDL_mixer
HINTS
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake
index 954c81d..d8f479f 100644
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@@ -32,6 +32,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if(NOT SDL_NET_INCLUDE_DIR AND SDLNET_INCLUDE_DIR)
+ set(SDL_NET_INCLUDE_DIR ${SDLNET_INCLUDE_DIR} CACHE PATH "directory cache
+entry initialized from old variable name")
+endif()
find_path(SDL_NET_INCLUDE_DIR SDL_net.h
HINTS
ENV SDLNETDIR
@@ -39,6 +43,10 @@ find_path(SDL_NET_INCLUDE_DIR SDL_net.h
PATH_SUFFIXES SDL SDL12 SDL11
)
+if(NOT SDL_NET_LIBRARY AND SDLNET_LIBRARY)
+ set(SDL_NET_LIBRARY ${SDLNET_LIBRARY} CACHE FILEPATH "file cache entry
+initialized from old variable name")
+endif()
find_library(SDL_NET_LIBRARY
NAMES SDL_net
HINTS
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index c8b7a77..2cc5ee2 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -32,6 +32,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if(NOT SDL_TTF_INCLUDE_DIR AND SDLTTF_INCLUDE_DIR)
+ set(SDL_TTF_INCLUDE_DIR ${SDLTTF_INCLUDE_DIR} CACHE PATH "directory cache
+entry initialized from old variable name")
+endif()
find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
HINTS
ENV SDLTTFDIR
@@ -39,6 +43,10 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
PATH_SUFFIXES SDL SDL12 SDL11
)
+if(NOT SDL_TTF_LIBRARY AND SDLTTF_LIBRARY)
+ set(SDL_TTF_LIBRARY ${SDLTTF_LIBRARY} CACHE FILEPATH "file cache entry
+initialized from old variable name")
+endif()
find_library(SDL_TTF_LIBRARY
NAMES SDL_ttf
HINTS