Changeset 95998 in webkit


Ignore:
Timestamp:
Sep 26, 2011 2:47:46 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[CMake] Remove FindFreetype.cmake
https://bugs.webkit.org/show_bug.cgi?id=68778

Patch by Raphael Kubo da Costa <kubo@profusion.mobi> 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}.

Location:
trunk
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r95996 r95998  
     12011-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
    1202011-09-26  Alejandro G. Castro  <alex@igalia.com>
    221
  • trunk/Source/WebCore/CMakeListsEfl.txt

    r95935 r95998  
    208208  ${EFLDEPS_LIBRARIES}
    209209  ${EVAS_LIBRARIES}
    210   ${Freetype_LIBRARIES}
     210  ${FREETYPE_LIBRARIES}
    211211  ${ICU_LIBRARIES}
    212212  ${LIBXML2_LIBRARIES}
     
    241241  ${EFLDEPS_INCLUDE_DIRS}
    242242  ${EVAS_INCLUDE_DIRS}
    243   ${Freetype_INCLUDE_DIRS}
     243  ${FREETYPE_INCLUDE_DIRS}
    244244  ${ICU_INCLUDE_DIRS}
    245245  ${LIBXML2_INCLUDE_DIR}
  • trunk/Source/WebCore/ChangeLog

    r95997 r95998  
     12011-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
    1162011-09-26  Alexei Svitkine  <asvitkine@chromium.org>
    217
  • trunk/Source/WebKit/efl/CMakeListsEfl.txt

    r94965 r95998  
    9090    ${ECORE_X_LIBRARIES}
    9191    ${EFLDEPS_LIBRARIES}
    92     ${Freetype_LIBRARIES}
     92    ${FREETYPE_LIBRARIES}
    9393    ${LIBXML2_LIBRARIES}
    9494    ${SQLITE_LIBRARIES}
  • trunk/Source/WebKit/efl/ChangeLog

    r95983 r95998  
     12011-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
    1142011-09-26  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
    215
  • trunk/Source/cmake/FindCairo.cmake

    r95379 r95998  
    3333# Set the include dir variables and the libraries and let libfind_process do the rest.
    3434# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
    35 set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR Freetype_INCLUDE_DIRS)
    36 set(Cairo_PROCESS_LIBS Cairo_LIBRARY Freetype_LIBRARIES)
     35set(Cairo_PROCESS_INCLUDES Cairo_INCLUDE_DIR FREETYPE_INCLUDE_DIRS)
     36set(Cairo_PROCESS_LIBS Cairo_LIBRARY FREETYPE_LIBRARIES)
    3737libfind_process(Cairo)
    3838
  • trunk/Source/cmake/FindPango.cmake

    r94876 r95998  
    4141# Set the include dir variables and the libraries and let libfind_process do the rest.
    4242# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
    43 set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR Freetype_INCLUDE_DIRS)
    44 set(Pango_PROCESS_LIBS Pango_LIBRARY Freetype_LIBRARIES)
     43set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR FREETYPE_INCLUDE_DIRS)
     44set(Pango_PROCESS_LIBS Pango_LIBRARY FREETYPE_LIBRARIES)
    4545libfind_process(Pango)
    4646
  • trunk/Source/cmake/OptionsEfl.cmake

    r95919 r95998  
    124124
    125125IF (FONT_BACKEND STREQUAL "freetype")
    126   FIND_PACKAGE(Freetype 9.0 REQUIRED)
     126  FIND_PACKAGE(Freetype REQUIRED)
    127127  SET(WTF_USE_FREETYPE 1)
    128128  ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
Note: See TracChangeset for help on using the changeset viewer.