From 64415dd91e6d0d228d190e9a3b1148ce6d96fb26 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Mon, 26 Sep 2011 21:47:46 +0000 Subject: [PATCH] [CMake] Remove FindFreetype.cmake https://bugs.webkit.org/show_bug.cgi?id=68778 Patch by Raphael Kubo da Costa on 2011-09-26 Reviewed by Adam Barth. CMake has provided its own FindFreetype.cmake forever, so there is no need to have another implementation in WebKit. .: * Source/cmake/FindCairo.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. * Source/cmake/FindFreetype.cmake: Removed. * Source/cmake/FindPango.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. * Source/cmake/OptionsEfl.cmake: Remove minimum required version check, it has never been checked and Freetype 2.1.10 from 2005 is already > 9.0. Source/WebCore: No new tests, just a buildsystem change. * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. Source/WebKit/efl: * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95998 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 19 +++++++++++++++++++ Source/WebCore/CMakeListsEfl.txt | 4 ++-- Source/WebCore/ChangeLog | 15 +++++++++++++++ Source/WebKit/efl/CMakeListsEfl.txt | 2 +- Source/WebKit/efl/ChangeLog | 13 +++++++++++++ Source/cmake/FindCairo.cmake | 4 ++-- Source/cmake/FindFreetype.cmake | 31 ------------------------------- Source/cmake/FindPango.cmake | 4 ++-- Source/cmake/OptionsEfl.cmake | 2 +- 9 files changed, 55 insertions(+), 39 deletions(-) delete mode 100644 Source/cmake/FindFreetype.cmake diff --git a/ChangeLog b/ChangeLog index dd151c0..3565254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2011-09-26 Raphael Kubo da Costa + + [CMake] Remove FindFreetype.cmake + https://bugs.webkit.org/show_bug.cgi?id=68778 + + Reviewed by Adam Barth. + + CMake has provided its own FindFreetype.cmake forever, so there is no + need to have another implementation in WebKit. + + * Source/cmake/FindCairo.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} + instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. + * Source/cmake/FindFreetype.cmake: Removed. + * Source/cmake/FindPango.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} + instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. + * Source/cmake/OptionsEfl.cmake: Remove minimum required version + check, it has never been checked and Freetype 2.1.10 from 2005 is + already > 9.0. + 2011-09-26 Alejandro G. Castro [GTK] pot file is not properly remove during distcheck diff --git a/Source/WebCore/CMakeListsEfl.txt b/Source/WebCore/CMakeListsEfl.txt index 5b8ecbb..db14bdd 100644 --- a/Source/WebCore/CMakeListsEfl.txt +++ b/Source/WebCore/CMakeListsEfl.txt @@ -207,7 +207,7 @@ LIST(APPEND WebCore_LIBRARIES ${ECORE_X_LIBRARIES} ${EFLDEPS_LIBRARIES} ${EVAS_LIBRARIES} - ${Freetype_LIBRARIES} + ${FREETYPE_LIBRARIES} ${ICU_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} @@ -240,7 +240,7 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES ${ECORE_X_INCLUDE_DIRS} ${EFLDEPS_INCLUDE_DIRS} ${EVAS_INCLUDE_DIRS} - ${Freetype_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} ${ICU_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIRS} diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 0d3d37e..944f015 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2011-09-26 Raphael Kubo da Costa + + [CMake] Remove FindFreetype.cmake + https://bugs.webkit.org/show_bug.cgi?id=68778 + + Reviewed by Adam Barth. + + CMake has provided its own FindFreetype.cmake forever, so there is no + need to have another implementation in WebKit. + + No new tests, just a buildsystem change. + + * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of + Freetype_{LIBRARIES,INCLUDE_DIRS}. + 2011-09-26 Alexei Svitkine Fix full-page rubber band overhang appearing when gesturing during a slow page load. diff --git a/Source/WebKit/efl/CMakeListsEfl.txt b/Source/WebKit/efl/CMakeListsEfl.txt index a2660bf..f9db35c 100644 --- a/Source/WebKit/efl/CMakeListsEfl.txt +++ b/Source/WebKit/efl/CMakeListsEfl.txt @@ -89,7 +89,7 @@ LIST(APPEND WebKit_LIBRARIES ${Cairo_LIBRARIES} ${ECORE_X_LIBRARIES} ${EFLDEPS_LIBRARIES} - ${Freetype_LIBRARIES} + ${FREETYPE_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${FONTCONFIG_LIBRARIES} diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog index 143008d..f9135f0 100755 --- a/Source/WebKit/efl/ChangeLog +++ b/Source/WebKit/efl/ChangeLog @@ -1,3 +1,16 @@ +2011-09-26 Raphael Kubo da Costa + + [CMake] Remove FindFreetype.cmake + https://bugs.webkit.org/show_bug.cgi?id=68778 + + Reviewed by Adam Barth. + + CMake has provided its own FindFreetype.cmake forever, so there is no + need to have another implementation in WebKit. + + * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of + Freetype_{LIBRARIES,INCLUDE_DIRS}. + 2011-09-26 Lucas De Marchi [EFL] Add virtual method to notify user when wrapping focus diff --git a/Source/cmake/FindCairo.cmake b/Source/cmake/FindCairo.cmake index d7c53b9..901ed46 100644 --- a/Source/cmake/FindCairo.cmake +++ b/Source/cmake/FindCairo.cmake @@ -32,7 +32,7 @@ find_library(Cairo_LIBRARY # Set the include dir variables and the libraries and let libfind_process do the rest. # NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR Freetype_INCLUDE_DIRS) -set(Cairo_PROCESS_LIBS Cairo_LIBRARY Freetype_LIBRARIES) +set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR FREETYPE_INCLUDE_DIRS) +set(Cairo_PROCESS_LIBS Cairo_LIBRARY FREETYPE_LIBRARIES) libfind_process(Cairo) diff --git a/Source/cmake/FindFreetype.cmake b/Source/cmake/FindFreetype.cmake deleted file mode 100644 index b4c1685..0000000 --- a/Source/cmake/FindFreetype.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# - Try to find Freetype2 -# Once done, this will define -# -# Freetype_FOUND - system has Freetype -# Freetype_INCLUDE_DIRS - the Freetype include directories -# Freetype_LIBRARIES - link these to use Freetype - -include(LibFindMacros) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(Freetype_PKGCONF freetype2) - -# Include dir -find_path(Freetype_INCLUDE_DIR - NAMES freetype/freetype.h - PATHS ${Freetype_PKGCONF_INCLUDE_DIRS} - PATH_SUFFIXES freetype2 -) - -# Finally the library itself -find_library(Freetype_LIBRARY - NAMES freetype - PATHS ${Freetype_PKGCONF_LIBRARY_DIRS} -) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(Freetype_PROCESS_INCLUDES Freetype_INCLUDE_DIR) -set(Freetype_PROCESS_LIBS Freetype_LIBRARY) -libfind_process(Freetype) - diff --git a/Source/cmake/FindPango.cmake b/Source/cmake/FindPango.cmake index c71f041..2353df3 100644 --- a/Source/cmake/FindPango.cmake +++ b/Source/cmake/FindPango.cmake @@ -40,7 +40,7 @@ find_library(Pango_Cairo_LIBRARY # Set the include dir variables and the libraries and let libfind_process do the rest. # NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Freetype_INCLUDE_DIRS) -set(Pango_PROCESS_LIBS Pango_LIBRARY Freetype_LIBRARIES) +set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR FREETYPE_INCLUDE_DIRS) +set(Pango_PROCESS_LIBS Pango_LIBRARY FREETYPE_LIBRARIES) libfind_process(Pango) diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index ff81e37..af02f2e 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -123,7 +123,7 @@ ELSE () ENDIF () IF (FONT_BACKEND STREQUAL "freetype") - FIND_PACKAGE(Freetype 9.0 REQUIRED) + FIND_PACKAGE(Freetype REQUIRED) SET(WTF_USE_FREETYPE 1) ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1) ELSE () -- 2.7.4