Diff
Modified: trunk/ChangeLog (150766 => 150767)
--- trunk/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer <par...@webkit.org>
+
+ Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116210
+
+ Reviewed by Rob Buis.
+
+ Set and use the ICU_INCLUDE_DIRS variable to avoid
+ duplicated adding of the ICU include directory.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2013-05-24 Anders Carlsson <ander...@apple.com>
Remove PagePopup code
Modified: trunk/Source/_javascript_Core/ChangeLog (150766 => 150767)
--- trunk/Source/_javascript_Core/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer <par...@webkit.org>
+
+ Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116210
+
+ Reviewed by Rob Buis.
+
+ Set and use the ICU_INCLUDE_DIRS variable to avoid
+ duplicated adding of the ICU include directory.
+
+ * PlatformBlackBerry.cmake:
+
2013-05-27 Gabor Rapcsanyi <rga...@webkit.org>
MacroAssemblerARM should use xor to swap registers instead of move
Modified: trunk/Source/_javascript_Core/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/_javascript_Core/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/_javascript_Core/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,7 +1,3 @@
-list(INSERT _javascript_Core_INCLUDE_DIRECTORIES 0
- "${BLACKBERRY_THIRD_PARTY_DIR}/icu"
-)
-
list(REMOVE_ITEM _javascript_Core_SOURCES
runtime/GCActivityCallback.cpp
)
Modified: trunk/Source/WTF/ChangeLog (150766 => 150767)
--- trunk/Source/WTF/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WTF/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer <par...@webkit.org>
+
+ Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116210
+
+ Reviewed by Rob Buis.
+
+ Set and use the ICU_INCLUDE_DIRS variable to avoid
+ duplicated adding of the ICU include directory.
+
+ * wtf/PlatformBlackBerry.cmake:
+
2013-05-27 Ádám Kallai <ka...@inf.u-szeged.hu>
[Qt] Enable parallel GC. Probably it has been fixed in r131791.
Modified: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,7 +1,3 @@
list(APPEND WTF_SOURCES
blackberry/MainThreadBlackBerry.cpp
)
-
-list(INSERT WTF_INCLUDE_DIRECTORIES 0
- "${BLACKBERRY_THIRD_PARTY_DIR}/icu"
-)
Modified: trunk/Source/WebCore/ChangeLog (150766 => 150767)
--- trunk/Source/WebCore/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebCore/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer <par...@webkit.org>
+
+ Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116210
+
+ Reviewed by Rob Buis.
+
+ Set and use the ICU_INCLUDE_DIRS variable to avoid
+ duplicated adding of the ICU include directory.
+
+ * PlatformBlackBerry.cmake:
+
2013-05-27 Antti Koivisto <an...@apple.com>
Tighten FontGlyphs::glyphDataAndPageForCharacter to take FontDescription
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,6 +1,5 @@
list(INSERT WebCore_INCLUDE_DIRECTORIES 0
"${BLACKBERRY_THIRD_PARTY_DIR}" # For <unicode.h>, which is included from <sys/keycodes.h>.
- "${BLACKBERRY_THIRD_PARTY_DIR}/icu"
)
list(REMOVE_ITEM WebCore_SOURCES
Modified: trunk/Source/WebKit/ChangeLog (150766 => 150767)
--- trunk/Source/WebKit/ChangeLog 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebKit/ChangeLog 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,3 +1,15 @@
+2013-05-27 Patrick Gansterer <par...@webkit.org>
+
+ Use ICU_INCLUDE_DIRS in BlackBerry CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116210
+
+ Reviewed by Rob Buis.
+
+ Set and use the ICU_INCLUDE_DIRS variable to avoid
+ duplicated adding of the ICU include directory.
+
+ * PlatformBlackBerry.cmake:
+
2013-05-27 Carlos Garcia Campos <cgar...@igalia.com>
[BlackBerry] Move PagePopup implementation to WebKitSupport
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (150766 => 150767)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -1,6 +1,5 @@
list(INSERT WebKit_INCLUDE_DIRECTORIES 0
"${BLACKBERRY_THIRD_PARTY_DIR}" # For <unicode.h>, which is included from <sys/keycodes.h>.
- "${BLACKBERRY_THIRD_PARTY_DIR}/icu"
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (150766 => 150767)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2013-05-27 18:04:02 UTC (rev 150766)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2013-05-27 18:09:51 UTC (rev 150767)
@@ -230,3 +230,5 @@
set(BLACKBERRY_THIRD_PARTY_DIR "${CMAKE_BINARY_DIR}/ThirdPartyBlackBerry")
file(COPY ${THIRD_PARTY_ICU_DIR} DESTINATION "${BLACKBERRY_THIRD_PARTY_DIR}/icu")
file(COPY ${THIRD_PARTY_UNICODE_FILE} DESTINATION ${BLACKBERRY_THIRD_PARTY_DIR})
+
+set(ICU_INCLUDE_DIRS "${BLACKBERRY_THIRD_PARTY_DIR}/icu")
