Changeset 271257 in webkit

Timestamp:

Jan 7, 2021, 12:56:28 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Add USE_APPLE_ICU option
​https://bugs.webkit.org/show_bug.cgi?id=220081

Patch by Monson Shao <​holymonson@gmail.com> on 2021-01-07
Reviewed by Yusuke Suzuki.

Add USE_APPLE_ICU option to allow non-Mac ports (GTK or JSCOnly) on Darwin could build with
non-Apple ICU.

.:

• Source/cmake/OptionsCommon.cmake:
• Source/cmake/WebKitFindPackage.cmake:

Source/WTF:

• CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WTF/CMakeLists.txt (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/WebKitFindPackage.cmake (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2021-01-07  Monson Shao  <holymonson@gmail.com>
+
+        [CMake] Add USE_APPLE_ICU option
+        https://bugs.webkit.org/show_bug.cgi?id=220081
+
+        Reviewed by Yusuke Suzuki.
+
+        Add USE_APPLE_ICU option to allow non-Mac ports (GTK or JSCOnly) on Darwin could build with
+        non-Apple ICU.
+
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/WebKitFindPackage.cmake:
+
 2021-01-06  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WTF/CMakeLists.txt

@@ -7 +7 @@
 # Apple builds have the ICU headers checked into ${WTF_DIR}/icu
 # Copy them into ${ICU_INCLUDE_DIRS} so the build behaves like find_package was used
-if (APPLE)
+if (USE_APPLE_ICU)
     file(COPY ${WTF_DIR}/icu/unicode DESTINATION ${ICU_INCLUDE_DIRS})
 endif ()

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-01-07  Monson Shao  <holymonson@gmail.com>
+
+        [CMake] Add USE_APPLE_ICU option
+        https://bugs.webkit.org/show_bug.cgi?id=220081
+
+        Reviewed by Yusuke Suzuki.
+
+        Add USE_APPLE_ICU option to allow non-Mac ports (GTK or JSCOnly) on Darwin could build with
+        non-Apple ICU.
+
+        * CMakeLists.txt:
+
 2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -101 +101 @@
   ${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
 
+option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE})
+
 # Enable the usage of OpenMP.
 #  - At this moment, OpenMP is only used as an alternative implementation

trunk/Source/cmake/WebKitFindPackage.cmake

@@ -7 +7 @@
 #
 # The purpose of this file is to make the behavior of find_package consistent
-# across ports and CMake versions. 
+# across ports and CMake versions.
 
 # CMake provided targets. Remove wrappers whenever the minimum version is bumped.
@@ -87 +87 @@
 
     # Apple builds have a unique location for ICU
-    if (APPLE AND "${package}" STREQUAL "ICU")
+    if (USE_APPLE_ICU AND "${package}" STREQUAL "ICU")
         set(_found_package ON)
 
@@ -99 +99 @@
         set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
         set(ICU_FOUND ON)
+        message(STATUS "Found ICU: ${ICU_LIBRARIES}")
     endif ()