Log Message
[GTK][Efl] Do not require LibXslt if XSLT is disabled https://bugs.webkit.org/show_bug.cgi?id=167931
This fixes build with --no-xslt, when the libxslt dev files are not installed. Patch by Olivier Blin <olivier.b...@softathome.com> on 2017-02-07 Reviewed by Michael Catanzaro. * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (211812 => 211813)
--- trunk/ChangeLog 2017-02-07 16:59:12 UTC (rev 211812)
+++ trunk/ChangeLog 2017-02-07 17:20:57 UTC (rev 211813)
@@ -1,3 +1,15 @@
+2017-02-07 Olivier Blin <olivier.b...@softathome.com>
+
+ [GTK][Efl] Do not require LibXslt if XSLT is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=167931
+
+ This fixes build with --no-xslt, when the libxslt dev files are not installed.
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2017-02-03 Konstantin Tokarev <annu...@yandex.ru>
[CMake] RelWithDebInfo builds are super broken at runtime
Modified: trunk/Source/cmake/OptionsEfl.cmake (211812 => 211813)
--- trunk/Source/cmake/OptionsEfl.cmake 2017-02-07 16:59:12 UTC (rev 211812)
+++ trunk/Source/cmake/OptionsEfl.cmake 2017-02-07 17:20:57 UTC (rev 211813)
@@ -140,7 +140,6 @@
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(LibGcrypt 1.6.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
-find_package(LibXslt 1.1.7 REQUIRED)
find_package(ICU REQUIRED)
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
@@ -149,6 +148,10 @@
find_package(WebP REQUIRED)
find_package(ZLIB REQUIRED)
+if (ENABLE_XSLT)
+ find_package(LibXslt 1.1.7 REQUIRED)
+endif ()
+
option(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)" ON)
if (ENABLE_ECORE_X)
# We need Xext.h to disable Xlib error messages when running WTR on Xvfb.
Modified: trunk/Source/cmake/OptionsGTK.cmake (211812 => 211813)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-02-07 16:59:12 UTC (rev 211812)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-02-07 17:20:57 UTC (rev 211813)
@@ -40,7 +40,6 @@
find_package(JPEG REQUIRED)
find_package(LibSoup 2.42.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
-find_package(LibXslt 1.1.7 REQUIRED)
find_package(PNG REQUIRED)
find_package(Sqlite REQUIRED)
find_package(Threads REQUIRED)
@@ -220,6 +219,10 @@
endif ()
find_package(GLIB 2.36 REQUIRED COMPONENTS ${glib_components})
+if (ENABLE_XSLT)
+ find_package(LibXslt 1.1.7 REQUIRED)
+endif ()
+
if (ENABLE_ACCELERATED_2D_CANVAS)
if (GLX_FOUND)
list(APPEND CAIROGL_COMPONENTS cairo-glx)
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
