Changeset 126305 in webkit

Timestamp:

Aug 22, 2012 8:46:01 AM (12 years ago)

Author:

rakuco@webkit.org

Message:

[EFL] Build failures with harfbuzz outside standard locations
​https://bugs.webkit.org/show_bug.cgi?id=93030

Reviewed by Rob Buis.

Add ${HARFBUZZ_INCLUDE_DIRS} to the list of included paths: so far
it was being implicitly pulled from evas's pkg-config file, and
used to work when WebKit-EFL's dependencies were built with
jhbuild -- in this case, harfbuzz is built before evas, which is
then built with harfbuzz support and adds the required paths to
its .pc file.

We need to include things directly to account for the case of
people not using jhbuild and thus not necessarily having harfbuzz
as an evas dependency.

• PlatformEfl.cmake:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  Raphael Kubo da Costa  <rakuco@webkit.org>
+
+        [EFL] Build failures with harfbuzz outside standard locations
+        https://bugs.webkit.org/show_bug.cgi?id=93030
+
+        Reviewed by Rob Buis.
+
+        Add ${HARFBUZZ_INCLUDE_DIRS} to the list of included paths: so far
+        it was being implicitly pulled from evas's pkg-config file, and
+        used to work when WebKit-EFL's dependencies were built with
+        jhbuild -- in this case, harfbuzz is built before evas, which is
+        then built with harfbuzz support and adds the required paths to
+        its .pc file.
+
+        We need to include things directly to account for the case of
+        people not using jhbuild and thus not necessarily having harfbuzz
+        as an evas dependency.
+
+        * PlatformEfl.cmake:
+
 2012-08-22  Raul Hudea  <rhudea@adobe.com>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -156 +156 @@
       "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
       "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
+      ${HARFBUZZ_INCLUDE_DIRS}
     )
     LIST(APPEND WebCore_SOURCES