Title: [183012] trunk/Source/WebCore
- Revision
- 183012
- Author
- mrobin...@webkit.org
- Date
- 2015-04-20 08:23:45 -0700 (Mon, 20 Apr 2015)
Log Message
[CMake] Include ICU unconditionally on the source lists
https://bugs.webkit.org/show_bug.cgi?id=143900
Reviewed by Darin Adler.
No new tests. This is just a build file change.
* CMakeLists.txt: Integrate ICU source files, includes, and libraries into the main
sections. They are shared by all platforms.
* PlatformGTK.cmake: Eliminate build rules that are duplicated from the main CMakeLists.txt.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (183011 => 183012)
--- trunk/Source/WebCore/CMakeLists.txt 2015-04-20 15:05:41 UTC (rev 183011)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-04-20 15:23:45 UTC (rev 183012)
@@ -129,6 +129,7 @@
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
"${CMAKE_BINARY_DIR}"
+ ${ICU_INCLUDE_DIRS}
)
set(WebCore_IDL_INCLUDES
@@ -2272,14 +2273,20 @@
platform/text/TextBoundaries.cpp
platform/text/TextBreakIterator.cpp
platform/text/TextCodec.cpp
+ platform/text/TextCodecICU.cpp
platform/text/TextCodecLatin1.cpp
platform/text/TextCodecUTF16.cpp
platform/text/TextCodecUTF8.cpp
platform/text/TextCodecUserDefined.cpp
platform/text/TextEncoding.cpp
+ platform/text/TextEncodingDetectorICU.cpp
platform/text/TextEncodingRegistry.cpp
platform/text/TextStream.cpp
+ platform/text/icu/UTextProvider.cpp
+ platform/text/icu/UTextProviderLatin1.cpp
+ platform/text/icu/UTextProviderUTF16.cpp
+
plugins/DOMMimeType.cpp
plugins/DOMMimeTypeArray.cpp
plugins/DOMPlugin.cpp
@@ -2776,6 +2783,7 @@
)
set(WebCore_LIBRARIES
+ ${ICU_LIBRARIES}
_javascript_Core
WTF
)
@@ -2982,20 +2990,6 @@
)
endif ()
-list(APPEND WebCore_SOURCES
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
- platform/text/icu/UTextProvider.cpp
- platform/text/icu/UTextProviderLatin1.cpp
- platform/text/icu/UTextProviderUTF16.cpp
-)
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- ${ICU_INCLUDE_DIRS}
-)
-list(APPEND WebCore_LIBRARIES
- ${ICU_LIBRARIES}
-)
-
if (WTF_USE_3D_GRAPHICS)
# For platforms that want to use system-provided OpenGL (ES) headers,
# these include directories need to be added before the ANGLE directories.
Modified: trunk/Source/WebCore/ChangeLog (183011 => 183012)
--- trunk/Source/WebCore/ChangeLog 2015-04-20 15:05:41 UTC (rev 183011)
+++ trunk/Source/WebCore/ChangeLog 2015-04-20 15:23:45 UTC (rev 183012)
@@ -1,3 +1,16 @@
+2015-04-20 Martin Robinson <mrobin...@igalia.com>
+
+ [CMake] Include ICU unconditionally on the source lists
+ https://bugs.webkit.org/show_bug.cgi?id=143900
+
+ Reviewed by Darin Adler.
+
+ No new tests. This is just a build file change.
+
+ * CMakeLists.txt: Integrate ICU source files, includes, and libraries into the main
+ sections. They are shared by all platforms.
+ * PlatformGTK.cmake: Eliminate build rules that are duplicated from the main CMakeLists.txt.
+
2015-04-20 Chris Fleizach <cfleiz...@apple.com>
AX: iOS: Text input field ignores value of read-only and aria-readonly attributes
Modified: trunk/Source/WebCore/PlatformGTK.cmake (183011 => 183012)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-04-20 15:05:41 UTC (rev 183011)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-04-20 15:23:45 UTC (rev 183012)
@@ -21,7 +21,6 @@
"${WEBCORE_DIR}/platform/network/gtk"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/gtk"
- "${WEBCORE_DIR}/platform/text/icu"
)
list(APPEND WebCore_SOURCES
@@ -174,12 +173,7 @@
platform/soup/SharedBufferSoup.cpp
platform/soup/URLSoup.cpp
- platform/text/icu/UTextProvider.cpp
- platform/text/icu/UTextProviderLatin1.cpp
- platform/text/icu/UTextProviderUTF16.cpp
platform/text/LocaleICU.cpp
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
platform/text/enchant/TextCheckerEnchant.cpp
@@ -268,7 +262,6 @@
${GLIB_LIBRARIES}
${GUDEV_LIBRARIES}
${HARFBUZZ_LIBRARIES}
- ${ICU_LIBRARIES}
${JPEG_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
@@ -295,7 +288,6 @@
${GLIB_INCLUDE_DIRS}
${GUDEV_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
- ${ICU_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
