Title: [271257] trunk
- Revision
- 271257
- Author
- [email protected]
- Date
- 2021-01-07 12:56:28 -0800 (Thu, 07 Jan 2021)
Log Message
[CMake] Add USE_APPLE_ICU option
https://bugs.webkit.org/show_bug.cgi?id=220081
Patch by Monson Shao <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (271256 => 271257)
--- trunk/ChangeLog 2021-01-07 20:56:19 UTC (rev 271256)
+++ trunk/ChangeLog 2021-01-07 20:56:28 UTC (rev 271257)
@@ -1,3 +1,16 @@
+2021-01-07 Monson Shao <[email protected]>
+
+ [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 <[email protected]>
Make svn status ignore Python 3 __pycache__ directories.
Modified: trunk/Source/WTF/CMakeLists.txt (271256 => 271257)
--- trunk/Source/WTF/CMakeLists.txt 2021-01-07 20:56:19 UTC (rev 271256)
+++ trunk/Source/WTF/CMakeLists.txt 2021-01-07 20:56:28 UTC (rev 271257)
@@ -6,6 +6,6 @@
# 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 ()
Modified: trunk/Source/WTF/ChangeLog (271256 => 271257)
--- trunk/Source/WTF/ChangeLog 2021-01-07 20:56:19 UTC (rev 271256)
+++ trunk/Source/WTF/ChangeLog 2021-01-07 20:56:28 UTC (rev 271257)
@@ -1,3 +1,15 @@
+2021-01-07 Monson Shao <[email protected]>
+
+ [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 <[email protected]>
[GTK] Build failures with GTK4 3.99.5.1
Modified: trunk/Source/cmake/OptionsCommon.cmake (271256 => 271257)
--- trunk/Source/cmake/OptionsCommon.cmake 2021-01-07 20:56:19 UTC (rev 271256)
+++ trunk/Source/cmake/OptionsCommon.cmake 2021-01-07 20:56:28 UTC (rev 271257)
@@ -100,6 +100,8 @@
"Produce debug line information for offlineasm-generated code"
${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
# to native threads for the parallelization of the SVG filters.
Modified: trunk/Source/cmake/WebKitFindPackage.cmake (271256 => 271257)
--- trunk/Source/cmake/WebKitFindPackage.cmake 2021-01-07 20:56:19 UTC (rev 271256)
+++ trunk/Source/cmake/WebKitFindPackage.cmake 2021-01-07 20:56:28 UTC (rev 271257)
@@ -6,7 +6,7 @@
# nicer to work with.
#
# 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.
#
@@ -86,7 +86,7 @@
endif ()
# 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)
set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
@@ -98,6 +98,7 @@
set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
set(ICU_FOUND ON)
+ message(STATUS "Found ICU: ${ICU_LIBRARIES}")
endif ()
if (NOT _found_package)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
