Skip to content

Commit

Permalink
Merge r222727 - [WPE] Do not require XSLT if disabled
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=177752

Patch by Olivier Blin <olivier.blin@softathome.com> on 2017-10-02
Reviewed by Michael Catanzaro.

* Source/cmake/OptionsWPE.cmake: libxslt is not a hard dep
  • Loading branch information
blino authored and carlosgcampos committed Oct 17, 2017
1 parent 90c7152 commit ded37a3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
9 changes: 9 additions & 0 deletions ChangeLog
@@ -1,3 +1,12 @@
2017-10-02 Olivier Blin <olivier.blin@softathome.com>

[WPE] Do not require XSLT if disabled
https://bugs.webkit.org/show_bug.cgi?id=177752

Reviewed by Michael Catanzaro.

* Source/cmake/OptionsWPE.cmake: libxslt is not a hard dep

2017-09-26 Zan Dobersek <zdobersek@igalia.com>

[CMake] Use implicit include directories for Clang as well
Expand Down
5 changes: 4 additions & 1 deletion Source/cmake/OptionsWPE.cmake
Expand Up @@ -73,13 +73,16 @@ find_package(LibEpoxy 1.4.0 REQUIRED)
find_package(LibGcrypt 1.6.0 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(WebP REQUIRED)

find_package(WPEBackend REQUIRED)

if (ENABLE_XSLT)
find_package(LibXslt 1.1.7 REQUIRED)
endif ()

set(USE_CAIRO ON)
set(USE_XDGMIME ON)
SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
Expand Down

0 comments on commit ded37a3

Please sign in to comment.