[cmake] Unreviewed, add definitions necessary to use ICU shipped with macOS

       macOS system ICU libraries are built with U_DISABLE_RENAMING=1 and
       U_SHOW_CPLUSPLUS_API=0. After r219155 we have to pass this definitons
       explicitly, because ICU headers in the tree are not modified anymore.

.:

* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:

Source/WTF:

* wtf/PlatformMac.cmake: Rely on ICU_LIBRARIES instead of passing ICU
library name explicitly in WTF_LIBRARIES.

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

diff --git a/ChangeLog b/ChangeLog
index 24635698e8b8dd19971bcf0d0ad6a49636b69e15..f4222fd3ab196e3b0b181b05e0638b5aed653bd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-07-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+       [cmake] Unreviewed, add definitions necessary to use ICU shipped with macOS
+
+       macOS system ICU libraries are built with U_DISABLE_RENAMING=1 and
+       U_SHOW_CPLUSPLUS_API=0. After r219155 we have to pass this definitons
+       explicitly, because ICU headers in the tree are not modified anymore.
+
+        * Source/cmake/OptionsJSCOnly.cmake:
+        * Source/cmake/OptionsMac.cmake:
+
 2017-07-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Add initial implementation of WebDriver process to run the HTTP server

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 53e5ae0373f80e4c9789e1c62244e6ac0e4327e5..179e9b6a1caced63aa6764a1d931a177b144e4a4 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2017-07-21  Konstantin Tokarev  <annulen@yandex.ru>
+
+       [cmake] Unreviewed, add definitions necessary to use ICU shipped with macOS
+
+       macOS system ICU libraries are built with U_DISABLE_RENAMING=1 and
+       U_SHOW_CPLUSPLUS_API=0. After r219155 we have to pass this definitons
+       explicitly, because ICU headers in the tree are not modified anymore.
+
+        * wtf/PlatformMac.cmake: Rely on ICU_LIBRARIES instead of passing ICU
+        library name explicitly in WTF_LIBRARIES.
+
 2017-07-20  Chris Dumez  <cdumez@apple.com>
 
         Replace calls to Vector::resize() with calls to more efficient shrink() / grow() when applicable

diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
index a607dd04929bf0f7a353b0874ba1d07eb0e8051e..b4b1daf3394579e2e8343a12e001243eb4d2989a 100644 (file)
--- a/Source/WTF/wtf/PlatformMac.cmake
+++ b/Source/WTF/wtf/PlatformMac.cmake
@@ -5,7 +5,6 @@ list(APPEND WTF_LIBRARIES
     ${COREFOUNDATION_LIBRARY}
     ${COCOA_LIBRARY}
     ${READLINE_LIBRARY}
-    libicucore.dylib
 )
 
 list(APPEND WTF_SOURCES

diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index 26be3f5a14c4a38c046a9b755b9aed9eccb5a533..9e3f60dc6a5c0906408bd905eb139861bfc4d32b 100644 (file)
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -87,5 +87,6 @@ endif ()
 if (NOT APPLE)
     find_package(ICU REQUIRED)
 else ()
+    add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
     set(ICU_LIBRARIES libicucore.dylib)
 endif ()

diff --git a/Source/cmake/OptionsMac.cmake b/Source/cmake/OptionsMac.cmake
index b92b11296298f2a7f1afae55e5cd706066150f1b..a8485761371b30c719f03017b434bd2cbb24a2f7 100644 (file)
--- a/Source/cmake/OptionsMac.cmake
+++ b/Source/cmake/OptionsMac.cmake
@@ -117,3 +117,6 @@ set(ENABLE_WEBKIT ON)
 set(WebCore_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
 set(WebKit_LIBRARY_TYPE SHARED)
+
+add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
+set(ICU_LIBRARIES libicucore.dylib)