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 cc24cf98b5e068e75454f5fc36ddf963b5d6e248 (commit) via b213a7f6ab0d4aa18e7b704bf1cf4994fae77254 (commit) from 67d41ab4747fb6233780e20ada47d4f8f2720625 (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc24cf98b5e068e75454f5fc36ddf963b5d6e248 commit cc24cf98b5e068e75454f5fc36ddf963b5d6e248 Merge: 67d41ab b213a7f Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Jun 17 11:54:03 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jun 17 11:54:03 2016 -0400 Merge topic 'FindFreetype-debug-lib' into next b213a7f6 FindFreetype: Find release and debug libraries separately https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b213a7f6ab0d4aa18e7b704bf1cf4994fae77254 commit b213a7f6ab0d4aa18e7b704bf1cf4994fae77254 Author: Stuart Mentzer <stuart_ment...@objexx.com> AuthorDate: Sun Jun 12 13:52:36 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Jun 17 11:52:18 2016 -0400 FindFreetype: Find release and debug libraries separately diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index dc6336d..e38e5ed 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -87,15 +87,28 @@ find_path( freetype2 ) -find_library(FREETYPE_LIBRARY - NAMES - freetype - libfreetype - freetype219 - ${FREETYPE_FIND_ARGS} - PATH_SUFFIXES - lib -) +if(NOT FREETYPE_LIBRARY) + find_library(FREETYPE_LIBRARY_RELEASE + NAMES + freetype + libfreetype + freetype219 + ${FREETYPE_FIND_ARGS} + PATH_SUFFIXES + lib + ) + find_library(FREETYPE_LIBRARY_DEBUG + NAMES + freetyped + libfreetyped + freetype219d + ${FREETYPE_FIND_ARGS} + PATH_SUFFIXES + lib + ) + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + select_library_configurations(FREETYPE) +endif() unset(FREETYPE_FIND_ARGS) @@ -147,7 +160,6 @@ find_package_handle_standard_args( ) mark_as_advanced( - FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build ) ----------------------------------------------------------------------- Summary of changes: Modules/FindFreetype.cmake | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits