[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-773-gd6affa6

[Brad King]

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  d6affa659bb449c30c2c6a338958109940e8a7b6 (commit)
       via  d71db3a0d88fd41c7e8f3ef23368e919d5c5cded (commit)
      from  d1272b811983b1ec82182862a029fe5ea632654d (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=d6affa659bb449c30c2c6a338958109940e8a7b6
commit d6affa659bb449c30c2c6a338958109940e8a7b6
Merge: d1272b8 d71db3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 10 09:40:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 10 09:40:24 2014 -0400

    Merge topic 'FindSDL-consistent-path-suffixes' into next
    
    d71db3a0 FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d71db3a0d88fd41c7e8f3ef23368e919d5c5cded
commit d71db3a0d88fd41c7e8f3ef23368e919d5c5cded
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 6 16:18:56 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 10 09:40:34 2014 -0400

    FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module
    
    Add the 'SDL' path suffix to the FindSDL_*.cmake modules.  Add a comment
    explaining the purpose of suffixes as in commit v3.0.0-rc1~540^2
    (FindSDL: Add path suffixes for <prefix>/include/..., 2013-10-08).
    
    Inspired-by: Adrien Destugues <pulkomandy at pulkomandy.tk>

diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index e5173e3..fc2c043 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -54,7 +54,9 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
   HINTS
     ENV SDLIMAGEDIR
     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)
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index 8f2f066..176fee6 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -54,7 +54,9 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
   HINTS
     ENV SDLMIXERDIR
     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)
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake
index e5c2cdb..ef23573 100644
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@@ -54,7 +54,9 @@ find_path(SDL_NET_INCLUDE_DIR SDL_net.h
   HINTS
     ENV SDLNETDIR
     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)
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 3a6ab7b..8b22ff7 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -98,7 +98,9 @@ find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   HINTS
     ENV SDLSOUNDDIR
     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
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index 3f58ac1..4b527fa 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -54,7 +54,9 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
   HINTS
     ENV SDLTTFDIR
     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)

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

Summary of changes:
 Modules/FindSDL_image.cmake |    4 +++-
 Modules/FindSDL_mixer.cmake |    4 +++-
 Modules/FindSDL_net.cmake   |    4 +++-
 Modules/FindSDL_sound.cmake |    4 +++-
 Modules/FindSDL_ttf.cmake   |    4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake