[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-775-g4533a7d

[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  4533a7d1ff9a005c83386e80223236b65bc2b739 (commit)
       via  b79a1f67195f6bb7fddd52215f442f319139b531 (commit)
      from  d6affa659bb449c30c2c6a338958109940e8a7b6 (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=4533a7d1ff9a005c83386e80223236b65bc2b739
commit 4533a7d1ff9a005c83386e80223236b65bc2b739
Merge: d6affa6 b79a1f6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 10 09:41:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 10 09:41:32 2014 -0400

    Merge topic 'FindFreetype-path-suffix-without-include' into next
    
    b79a1f67 FindFreetype: Add plain 'freetype2' path suffix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b79a1f67195f6bb7fddd52215f442f319139b531
commit b79a1f67195f6bb7fddd52215f442f319139b531
Author:     Adrien Destugues <pulkomandy at pulkomandy.tk>
AuthorDate: Mon Mar 3 16:01:23 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 10 09:42:05 2014 -0400

    FindFreetype: Add plain 'freetype2' path suffix
    
    On Haiku, the headers are not in an 'include' directory.

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 6f03c86..f0f9fe1 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -62,7 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
     ENV GTKMM_BASEPATH
     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-  PATH_SUFFIXES include/freetype2 include
+  PATH_SUFFIXES include/freetype2 include freetype2
 )
 
 find_path(FREETYPE_INCLUDE_DIR_freetype2
@@ -79,7 +79,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
     ENV GTKMM_BASEPATH
     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
-  PATH_SUFFIXES include/freetype2 include
+  PATH_SUFFIXES include/freetype2 include freetype2
 )
 
 find_library(FREETYPE_LIBRARY

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

Summary of changes:
 Modules/FindFreetype.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake