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 6ae9c417a348009a46f143f7f7ff5d2752e52ffb (commit) via 488d9682cc0974713315cae60a8dae793caefc6a (commit) from fcdc24b725e8faf3a64b06ae9b1cda7597469627 (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=6ae9c417a348009a46f143f7f7ff5d2752e52ffb commit 6ae9c417a348009a46f143f7f7ff5d2752e52ffb Merge: fcdc24b 488d968 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jun 20 08:50:08 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jun 20 08:50:08 2013 -0400 Merge topic 'FindX11-OSX-10.8' into next 488d968 FindX11: Search in /opt/X11 for OS X 10.8 (#14232) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=488d9682cc0974713315cae60a8dae793caefc6a commit 488d9682cc0974713315cae60a8dae793caefc6a Author: Marius Schamschula <mschamsch...@gmail.com> AuthorDate: Wed Jun 19 14:43:00 2013 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jun 20 08:47:12 2013 -0400 FindX11: Search in /opt/X11 for OS X 10.8 (#14232) As of Mac OS X 10.8, X11 is no longer installed under /usr/X11, but under /opt/X11. diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index 3cd3cef..131d979 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -68,6 +68,7 @@ if (UNIX) /usr/openwin/include /usr/openwin/share/include /opt/graphics/OpenGL/include + /opt/X11/include ) set(X11_LIB_SEARCH_PATH @@ -75,6 +76,7 @@ if (UNIX) /usr/X11R6/lib /usr/X11R7/lib /usr/openwin/lib + /opt/X11/lib ) find_path(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) ----------------------------------------------------------------------- Summary of changes: Modules/FindX11.cmake | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits