Changeset 95998 in webkit
- Timestamp:
- Sep 26, 2011 2:47:46 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r95996 r95998 1 2011-09-26 Raphael Kubo da Costa <kubo@profusion.mobi> 2 3 [CMake] Remove FindFreetype.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=68778 5 6 Reviewed by Adam Barth. 7 8 CMake has provided its own FindFreetype.cmake forever, so there is no 9 need to have another implementation in WebKit. 10 11 * Source/cmake/FindCairo.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} 12 instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. 13 * Source/cmake/FindFreetype.cmake: Removed. 14 * Source/cmake/FindPango.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} 15 instead of Freetype_{LIBRARIES,INCLUDE_DIRS}. 16 * Source/cmake/OptionsEfl.cmake: Remove minimum required version 17 check, it has never been checked and Freetype 2.1.10 from 2005 is 18 already > 9.0. 19 1 20 2011-09-26 Alejandro G. Castro <alex@igalia.com> 2 21 -
trunk/Source/WebCore/CMakeListsEfl.txt
r95935 r95998 208 208 ${EFLDEPS_LIBRARIES} 209 209 ${EVAS_LIBRARIES} 210 ${F reetype_LIBRARIES}210 ${FREETYPE_LIBRARIES} 211 211 ${ICU_LIBRARIES} 212 212 ${LIBXML2_LIBRARIES} … … 241 241 ${EFLDEPS_INCLUDE_DIRS} 242 242 ${EVAS_INCLUDE_DIRS} 243 ${F reetype_INCLUDE_DIRS}243 ${FREETYPE_INCLUDE_DIRS} 244 244 ${ICU_INCLUDE_DIRS} 245 245 ${LIBXML2_INCLUDE_DIR} -
trunk/Source/WebCore/ChangeLog
r95997 r95998 1 2011-09-26 Raphael Kubo da Costa <kubo@profusion.mobi> 2 3 [CMake] Remove FindFreetype.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=68778 5 6 Reviewed by Adam Barth. 7 8 CMake has provided its own FindFreetype.cmake forever, so there is no 9 need to have another implementation in WebKit. 10 11 No new tests, just a buildsystem change. 12 13 * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of 14 Freetype_{LIBRARIES,INCLUDE_DIRS}. 15 1 16 2011-09-26 Alexei Svitkine <asvitkine@chromium.org> 2 17 -
trunk/Source/WebKit/efl/CMakeListsEfl.txt
r94965 r95998 90 90 ${ECORE_X_LIBRARIES} 91 91 ${EFLDEPS_LIBRARIES} 92 ${F reetype_LIBRARIES}92 ${FREETYPE_LIBRARIES} 93 93 ${LIBXML2_LIBRARIES} 94 94 ${SQLITE_LIBRARIES} -
trunk/Source/WebKit/efl/ChangeLog
r95983 r95998 1 2011-09-26 Raphael Kubo da Costa <kubo@profusion.mobi> 2 3 [CMake] Remove FindFreetype.cmake 4 https://bugs.webkit.org/show_bug.cgi?id=68778 5 6 Reviewed by Adam Barth. 7 8 CMake has provided its own FindFreetype.cmake forever, so there is no 9 need to have another implementation in WebKit. 10 11 * CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of 12 Freetype_{LIBRARIES,INCLUDE_DIRS}. 13 1 14 2011-09-26 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 15 -
trunk/Source/cmake/FindCairo.cmake
r95379 r95998 33 33 # Set the include dir variables and the libraries and let libfind_process do the rest. 34 34 # NOTE: Singular variables for this library, plural for libraries this this lib depends on. 35 set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR F reetype_INCLUDE_DIRS)36 set(Cairo_PROCESS_LIBS Cairo_LIBRARY F reetype_LIBRARIES)35 set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR FREETYPE_INCLUDE_DIRS) 36 set(Cairo_PROCESS_LIBS Cairo_LIBRARY FREETYPE_LIBRARIES) 37 37 libfind_process(Cairo) 38 38 -
trunk/Source/cmake/FindPango.cmake
r94876 r95998 41 41 # Set the include dir variables and the libraries and let libfind_process do the rest. 42 42 # NOTE: Singular variables for this library, plural for libraries this this lib depends on. 43 set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR F reetype_INCLUDE_DIRS)44 set(Pango_PROCESS_LIBS Pango_LIBRARY F reetype_LIBRARIES)43 set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR FREETYPE_INCLUDE_DIRS) 44 set(Pango_PROCESS_LIBS Pango_LIBRARY FREETYPE_LIBRARIES) 45 45 libfind_process(Pango) 46 46 -
trunk/Source/cmake/OptionsEfl.cmake
r95919 r95998 124 124 125 125 IF (FONT_BACKEND STREQUAL "freetype") 126 FIND_PACKAGE(Freetype 9.0REQUIRED)126 FIND_PACKAGE(Freetype REQUIRED) 127 127 SET(WTF_USE_FREETYPE 1) 128 128 ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
Note: See TracChangeset
for help on using the changeset viewer.