Title: [165471] trunk/Tools
- Revision
- 165471
- Author
- [email protected]
- Date
- 2014-03-12 08:41:13 -0700 (Wed, 12 Mar 2014)
Log Message
[CMake] Newer versions of CMake cannot find older versions of Freetype
https://bugs.webkit.org/show_bug.cgi?id=130107
Reviewed by Gustavo Noronha Silva.
* gtk/jhbuildrc: Work around a bug in newer CMakes by giving the FREETYPE_DIR hint
to CMake during jhbuild initialization.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165470 => 165471)
--- trunk/Tools/ChangeLog 2014-03-12 15:34:47 UTC (rev 165470)
+++ trunk/Tools/ChangeLog 2014-03-12 15:41:13 UTC (rev 165471)
@@ -1,3 +1,13 @@
+2014-03-11 Martin Robinson <[email protected]>
+
+ [CMake] Newer versions of CMake cannot find older versions of Freetype
+ https://bugs.webkit.org/show_bug.cgi?id=130107
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/jhbuildrc: Work around a bug in newer CMakes by giving the FREETYPE_DIR hint
+ to CMake during jhbuild initialization.
+
2014-03-12 Zalan Bujtas <[email protected]>
Add hiDPI support for compositing content in DumpRenderTree/WebKitTestRunner
Modified: trunk/Tools/gtk/jhbuildrc (165470 => 165471)
--- trunk/Tools/gtk/jhbuildrc 2014-03-12 15:34:47 UTC (rev 165470)
+++ trunk/Tools/gtk/jhbuildrc 2014-03-12 15:41:13 UTC (rev 165471)
@@ -31,3 +31,9 @@
# We always enable introspection so that we can sniff out problems with our
# annotations sooner rather than later.
autogenargs='--enable-introspection'
+
+# After https://github.com/Kitware/CMake/commit/7435ae7c97590a0713d86b63add761d5e1607ec1
+# CMake is no longer able to find the FreeType headers in our JHBuild root. We
+# work around this by specifying FREETYPE_DIR directly as a hint to the header
+# locator in CMake's bundled FindFreetype.cmake.
+addpath('FREETYPE_DIR', os.path.join(prefix, "include", "freetype2", "freetype"))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
