[Cmake-commits] CMake branch, next, updated. v2.8.9-697-g94a7740

[Benjamin Eikel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  94a77401cb1717b2fc2d96f24d91feeab70c968c (commit)
       via  ffd3105cdfe5df09fb4f00f7bc414b7aee55efa4 (commit)
      from  1390e5e353bb52d2c5aacba19c3f56c6fbc9c5e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94a77401cb1717b2fc2d96f24d91feeab70c968c
commit 94a77401cb1717b2fc2d96f24d91feeab70c968c
Merge: 1390e5e ffd3105
Author:     Benjamin Eikel <cmake at eikel.org>
AuthorDate: Sun Sep 23 07:54:59 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 23 07:54:59 2012 -0400

    Merge topic 'ImproveFindSDLxxxModules' into next
    
    ffd3105 Stay compatible with old input variables (fix suggested by David Cole)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffd3105cdfe5df09fb4f00f7bc414b7aee55efa4
commit ffd3105cdfe5df09fb4f00f7bc414b7aee55efa4
Author:     Benjamin Eikel <cmake at eikel.org>
AuthorDate: Sun Sep 23 13:53:23 2012 +0200
Commit:     Benjamin Eikel <cmake at eikel.org>
CommitDate: Sun Sep 23 13:53:23 2012 +0200

    Stay compatible with old input variables (fix suggested by David Cole)

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindSDL_image.cmake |    8 ++++++++
 Modules/FindSDL_mixer.cmake |    8 ++++++++
 Modules/FindSDL_net.cmake   |    8 ++++++++
 Modules/FindSDL_ttf.cmake   |    8 ++++++++
 4 files changed, 32 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake