[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6113-gebe82f4

[Daniele E. Domenichelli]

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  ebe82f456fb79bc321aee307ee24da4b735095f2 (commit)
       via  7435ae7c97590a0713d86b63add761d5e1607ec1 (commit)
       via  0ea589fdfcd9082122829d4959adc842cacbc558 (commit)
       via  68963b04690f1821a19fc4f888d947b725d2b53c (commit)
       via  6f6eec1ff69ef9521710a30c749bfb0286752d59 (commit)
      from  8d76948d996fc656a3f2b8982cc36a4b8457a9f0 (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=ebe82f456fb79bc321aee307ee24da4b735095f2
commit ebe82f456fb79bc321aee307ee24da4b735095f2
Merge: 8d76948 7435ae7
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Mon Dec 9 07:25:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 9 07:25:30 2013 -0500

    Merge topic 'FindFreetype-2.5' into next
    
    7435ae7 FindFreetype: Find ftheader.h with Freetype 2.5
    0ea589f CMake Nightly Date Stamp
    68963b0 CMake Nightly Date Stamp
    6f6eec1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7435ae7c97590a0713d86b63add761d5e1607ec1
commit 7435ae7c97590a0713d86b63add761d5e1607ec1
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Mon Dec 9 13:24:28 2013 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Mon Dec 9 13:24:28 2013 +0100

    FindFreetype: Find ftheader.h with Freetype 2.5

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 179dc00..9520f7d 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -65,7 +65,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
   PATH_SUFFIXES include/freetype2 include
 )
 
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+find_path(FREETYPE_INCLUDE_DIR_freetype2
+  NAMES
+    freetype/config/ftheader.h
+    config/ftheader.h
   HINTS
     ENV FREETYPE_DIR
   PATHS

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

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


hooks/post-receive
-- 
CMake