[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2695-g4cbb09c

[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  4cbb09c1bf7734bb86aa08d81dbf9b18b01cd4d9 (commit)
       via  a34839d2c92e11a9579b118d4c3cb07104b7179c (commit)
      from  489e552aa3713da6d990b12bfbffdb1b4846667c (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=4cbb09c1bf7734bb86aa08d81dbf9b18b01cd4d9
commit 4cbb09c1bf7734bb86aa08d81dbf9b18b01cd4d9
Merge: 489e552 a34839d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 24 08:19:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 24 08:19:32 2013 -0400

    Merge topic 'FindFreetype-gtkmm' into next
    
    a34839d FindFreetype: Detect Freetype installed by GtkMM installer for win


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a34839d2c92e11a9579b118d4c3cb07104b7179c
commit a34839d2c92e11a9579b118d4c3cb07104b7179c
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Jun 21 17:35:47 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Jun 21 17:43:20 2013 +0200

    FindFreetype: Detect Freetype installed by GtkMM installer for win

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 1df2399..ccea991 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -50,6 +50,9 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
     /usr/local/X11R6
     /usr/local/X11
     /usr/freeware
+    ENV GTKMM_BASEPATH
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
   PATH_SUFFIXES include/freetype2 include
 )
 
@@ -61,6 +64,9 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
     /usr/local/X11R6
     /usr/local/X11
     /usr/freeware
+    ENV GTKMM_BASEPATH
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
   PATH_SUFFIXES include/freetype2 include
 )
 
@@ -70,10 +76,13 @@ find_library(FREETYPE_LIBRARY
     ENV FREETYPE_DIR
   PATH_SUFFIXES lib
   PATHS
-  /usr/X11R6
-  /usr/local/X11R6
-  /usr/local/X11
-  /usr/freeware
+    /usr/X11R6
+    /usr/local/X11R6
+    /usr/local/X11
+    /usr/freeware
+    ENV GTKMM_BASEPATH
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
 )
 
 # set the user variables

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

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


hooks/post-receive
-- 
CMake