[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6133-g4213f09

[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  4213f09b7f048e906a4eca2f623416533ef3c046 (commit)
       via  9b08e3f5993eb004e3eb0d9ae8b593f553989f89 (commit)
      from  f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172 (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=4213f09b7f048e906a4eca2f623416533ef3c046
commit 4213f09b7f048e906a4eca2f623416533ef3c046
Merge: f3ccb10 9b08e3f
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Mon Dec 9 13:39:55 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 9 13:39:55 2013 -0500

    Merge topic 'FindFreetype-2.5' into next
    
    9b08e3f FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS


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

    FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS
    
    In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and
    FREETYPE_INCLUDE_DIR_freetype2 are the same

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 1f12ba6..6f03c86 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -100,6 +100,7 @@ find_library(FREETYPE_LIBRARY
 # set the user variables
 if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
   set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+  list(REMOVE_DUPLICATES FREETYPE_INCLUDE_DIRS)
 endif()
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
 

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

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


hooks/post-receive
-- 
CMake