[Cmake-commits] CMake branch, next, updated. v2.8.9-384-ge301b6b

[Rolf Eike Beer]

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  e301b6b906522f20ad317f10b4935ce4653103b0 (commit)
       via  9d91fc65fa955d6ba878a4f72a93a004b02af2a5 (commit)
       via  8797df41b285e7f17fdf1302e3b872ba94e110af (commit)
      from  1577079663bb2f720157ca614b6bae9600161a08 (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=e301b6b906522f20ad317f10b4935ce4653103b0
commit e301b6b906522f20ad317f10b4935ce4653103b0
Merge: 1577079 9d91fc6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Sep 6 02:58:19 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 6 02:58:19 2012 -0400

    Merge topic 'findfreetype-13502' into next
    
    9d91fc6 fix for discovering ft2build.h using FREETYPE_DIR environment var (#13502)
    8797df4 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d91fc65fa955d6ba878a4f72a93a004b02af2a5
commit 9d91fc65fa955d6ba878a4f72a93a004b02af2a5
Author:     Sergei Nikulov <sergey.nikulov at gmail.com>
AuthorDate: Fri Aug 31 12:24:37 2012 +0400
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Sep 6 08:57:03 2012 +0200

    fix for discovering ft2build.h using FREETYPE_DIR environment var (#13502)

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index c7cf0eb..cdb46be 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -46,9 +46,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
   HINTS
     ENV FREETYPE_DIR
   PATHS
-  /usr/local/X11R6/include
-  /usr/local/X11/include
-  /usr/freeware/include
+    /usr/local/X11R6
+    /usr/local/X11
+    /usr/freeware
+  PATH_SUFFIXES include/freetype2 include
 )
 
 find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h

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

Summary of changes:
 Modules/FindFreetype.cmake |    7 ++++---
 Source/CMakeVersion.cmake  |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake