[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6131-gf3ccb10

[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  f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172 (commit)
       via  bc49d820a276243324003bc34d92a69194938adf (commit)
      from  2d35d005e98784eafb2e530e528e08da3733ec46 (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=f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172
commit f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172
Merge: 2d35d00 bc49d82
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Mon Dec 9 13:34:12 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 9 13:34:12 2013 -0500

    Merge topic 'FindFreetype-2.5' into next
    
    bc49d82 FindFreetype: Detect version string with Freetype 2.5


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

    FindFreetype: Detect version string with Freetype 2.5

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 9520f7d..1f12ba6 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -103,8 +103,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
 endif()
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
 
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
+endif()
+
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
+    file(STRINGS "${FREETYPE_H}" freetype_version_str
          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
 
     unset(FREETYPE_VERSION_STRING)

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

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


hooks/post-receive
-- 
CMake