[Cmake-commits] CMake branch, next, updated. v2.8.12-3663-ge2970ea

[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  e2970ea1945e8f787a0cb42f2e52103d80ffd72b (commit)
       via  c5c217c6b53b035303747a2971b1b80be5391566 (commit)
      from  fa172933b6d151351741a99651ab04ce2915aa3f (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=e2970ea1945e8f787a0cb42f2e52103d80ffd72b
commit e2970ea1945e8f787a0cb42f2e52103d80ffd72b
Merge: fa17293 c5c217c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 10:13:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 10:13:59 2013 -0400

    Merge topic 'FindSDL-path-suffixes' into next
    
    c5c217c FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5c217c6b53b035303747a2971b1b80be5391566
commit c5c217c6b53b035303747a2971b1b80be5391566
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 10:07:03 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 10:09:17 2013 -0400

    FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)
    
    Also add a comment explaining the purpose of the include/SDL* path
    suffixes.  As explained in commit 7cb51739 (FindSDL: Restore
    accidentally dropped search paths (#13651), 2012-11-05) the include/SDL*
    path suffixes are for looking in the ENV{SDLDIR} location.
    
    Inspired-by: Adrien Destugues <pulkomandy at pulkomandy.tk>

diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index fec142e..a4f12ba 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -70,7 +70,9 @@
 find_path(SDL_INCLUDE_DIR SDL.h
   HINTS
     ENV SDLDIR
-  PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
+  PATH_SUFFIXES SDL SDL12 SDL11
+                # path suffixes to search inside ENV{SDLDIR}
+                include/SDL include/SDL12 include/SDL11 include
 )
 
 # SDL-1.1 is the name used by FreeBSD ports...

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

Summary of changes:
 Modules/FindSDL.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake