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 401af319ccb44e8e870c5ee1f70ec34452667bb0 (commit)
via 7cb5173969bc78bebdf2fe5c0aeb2d54712f8734 (commit)
from cb082443aa2ea6dc09b86af5303b483d7019033c (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=401af319ccb44e8e870c5ee1f70ec34452667bb0
commit 401af319ccb44e8e870c5ee1f70ec34452667bb0
Merge: cb08244 7cb5173
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 5 09:58:58 2012 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 5 09:58:58 2012 -0500
Merge topic 'fix-FindSDL-paths' into next
7cb5173 FindSDL: Restore accidentally dropped search paths (#13651)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cb5173969bc78bebdf2fe5c0aeb2d54712f8734
commit 7cb5173969bc78bebdf2fe5c0aeb2d54712f8734
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 5 09:43:52 2012 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 5 09:47:09 2012 -0500
FindSDL: Restore accidentally dropped search paths (#13651)
Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS
that are set by default, 2012-09-04) accidentally dropped some search
paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed
to search paths that were previously hard-coded.
Reported-by: Gino van den Bergen <g...@dtecta.com>
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 5cc219f..ef28314 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -70,7 +70,7 @@
find_path(SDL_INCLUDE_DIR SDL.h
HINTS
ENV SDLDIR
- PATH_SUFFIXES SDL SDL12 SDL11
+ PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
)
# SDL-1.1 is the name used by FreeBSD ports...
@@ -79,6 +79,7 @@ find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
HINTS
ENV SDLDIR
+ PATH_SUFFIXES lib
)
if(NOT SDL_BUILDING_LIBRARY)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindSDL.cmake | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
