- Revision
- 95998
- Author
- [email protected]
- Date
- 2011-09-26 14:47:46 -0700 (Mon, 26 Sep 2011)
Log Message
[CMake] Remove FindFreetype.cmake
https://bugs.webkit.org/show_bug.cgi?id=68778
Patch by Raphael Kubo da Costa <[email protected]> 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}.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (95997 => 95998)
--- trunk/ChangeLog 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/ChangeLog 2011-09-26 21:47:46 UTC (rev 95998)
@@ -1,3 +1,22 @@
+2011-09-26 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
[GTK] pot file is not properly remove during distcheck
Modified: trunk/Source/WebCore/CMakeListsEfl.txt (95997 => 95998)
--- trunk/Source/WebCore/CMakeListsEfl.txt 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/WebCore/CMakeListsEfl.txt 2011-09-26 21:47:46 UTC (rev 95998)
@@ -207,7 +207,7 @@
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
${EVAS_LIBRARIES}
- ${Freetype_LIBRARIES}
+ ${FREETYPE_LIBRARIES}
${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
@@ -240,7 +240,7 @@
${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}
Modified: trunk/Source/WebCore/ChangeLog (95997 => 95998)
--- trunk/Source/WebCore/ChangeLog 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/WebCore/ChangeLog 2011-09-26 21:47:46 UTC (rev 95998)
@@ -1,3 +1,18 @@
+2011-09-26 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
Fix full-page rubber band overhang appearing when gesturing during a slow page load.
Modified: trunk/Source/WebKit/efl/CMakeListsEfl.txt (95997 => 95998)
--- trunk/Source/WebKit/efl/CMakeListsEfl.txt 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/WebKit/efl/CMakeListsEfl.txt 2011-09-26 21:47:46 UTC (rev 95998)
@@ -89,7 +89,7 @@
${Cairo_LIBRARIES}
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
- ${Freetype_LIBRARIES}
+ ${FREETYPE_LIBRARIES}
${LIBXML2_LIBRARIES}
${SQLITE_LIBRARIES}
${FONTCONFIG_LIBRARIES}
Modified: trunk/Source/WebKit/efl/ChangeLog (95997 => 95998)
--- trunk/Source/WebKit/efl/ChangeLog 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-09-26 21:47:46 UTC (rev 95998)
@@ -1,3 +1,16 @@
+2011-09-26 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
[EFL] Add virtual method to notify user when wrapping focus
Modified: trunk/Source/cmake/FindCairo.cmake (95997 => 95998)
--- trunk/Source/cmake/FindCairo.cmake 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/cmake/FindCairo.cmake 2011-09-26 21:47:46 UTC (rev 95998)
@@ -32,7 +32,7 @@
# 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)
Deleted: trunk/Source/cmake/FindFreetype.cmake (95997 => 95998)
--- trunk/Source/cmake/FindFreetype.cmake 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/cmake/FindFreetype.cmake 2011-09-26 21:47:46 UTC (rev 95998)
@@ -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)
-
Modified: trunk/Source/cmake/FindPango.cmake (95997 => 95998)
--- trunk/Source/cmake/FindPango.cmake 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/cmake/FindPango.cmake 2011-09-26 21:47:46 UTC (rev 95998)
@@ -40,7 +40,7 @@
# 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)
Modified: trunk/Source/cmake/OptionsEfl.cmake (95997 => 95998)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-09-26 21:44:26 UTC (rev 95997)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-09-26 21:47:46 UTC (rev 95998)
@@ -123,7 +123,7 @@
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 ()
