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 d17bb22c5fba3976a9dcb7564219cf4f4e59aee2 (commit) via b3ccaed0f9433ff86203df66ac18919f8b08b149 (commit) from 2fdb710b7eb214a001d28209eb2d30c4e75cc5a5 (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=d17bb22c5fba3976a9dcb7564219cf4f4e59aee2 commit d17bb22c5fba3976a9dcb7564219cf4f4e59aee2 Merge: 2fdb710 b3ccaed Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Oct 8 10:07:10 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Oct 8 10:07:10 2013 -0400 Merge topic 'haiku-updates' into next b3ccaed Revert "FindSDL: Fix broken include paths" http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3ccaed0f9433ff86203df66ac18919f8b08b149 commit b3ccaed0f9433ff86203df66ac18919f8b08b149 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Oct 8 10:02:47 2013 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Oct 8 10:03:00 2013 -0400 Revert "FindSDL: Fix broken include paths" This reverts commit eac2adb5b46277be16ac2e577e369bdcd4c93339. 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. We can add both path suffixes in s separate topic. diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index 6adec1f..fec142e 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... ----------------------------------------------------------------------- Summary of changes: Modules/FindSDL.cmake | 2 +- 1 files changed, 1 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