[cmake] Use ICU include dirs in WebKit2 and WebKitTestRunner
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Feb 2016 16:30:29 +0000 (16:30 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Feb 2016 16:30:29 +0000 (16:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154479

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

Source/WebKit2:

* CMakeLists.txt:

Tools:

* WebKitTestRunner/CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Tools/ChangeLog
Tools/WebKitTestRunner/CMakeLists.txt

index 3c98fa8..ae8aaa5 100644 (file)
@@ -155,7 +155,9 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
 )
 
-set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES "")
+set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+    ${ICU_INCLUDE_DIRS}
+)
 
 if (ENABLE_GRAPHICS_CONTEXT_3D)
     list(APPEND WebKit2_INCLUDE_DIRECTORIES
index 2e8c260..f3d1ed9 100644 (file)
@@ -1,3 +1,12 @@
+2016-02-20  Olivier Blin  <olivier.blin@softathome.com>
+
+        [cmake] Use ICU include dirs in WebKit2 and WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=154479
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+
 2016-02-19  Brian Burg  <bburg@apple.com>
 
         WebAutomationSession should tell its delegate when its remote end disconnects
index ad6d05e..931e177 100644 (file)
@@ -1,3 +1,12 @@
+2016-02-20  Olivier Blin  <olivier.blin@softathome.com>
+
+        [cmake] Use ICU include dirs in WebKit2 and WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=154479
+
+        Reviewed by Michael Catanzaro.
+
+        * WebKitTestRunner/CMakeLists.txt:
+
 2016-02-19  Konstantin Tokarev  <annulen@yandex.ru>
 
         [GTK] Fixed link error when G_DEFINE_AUTOPTR_CLEANUP_FUNC is not defined.
index b81377a..6355772 100644 (file)
@@ -63,6 +63,7 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
 
 set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBSOUP_INCLUDE_DIRS}
+    ${ICU_INCLUDE_DIRS}
 )
 
 set(WebKitTestRunnerInjectedBundle_SOURCES