Diff
Modified: trunk/ChangeLog (150122 => 150123)
--- trunk/ChangeLog 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/ChangeLog 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,3 +1,16 @@
+2013-05-15 Patrick Gansterer <[email protected]>
+
+ Consolidate lists in WTF CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116142
+
+ Reviewed by Martin Robinson.
+
+ Move common files into the CMakeLists.txt to avoid duplicating the list of files.
+ Also rebase the recently added GTK files to match the other CMake ports, since
+ the submitted patch was based on an older version of the source tree.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2013-05-14 Zan Dobersek <[email protected]>
[GTK] Move generated ColorData.cpp, WebKitFontFamilyNames.(cpp|h) build targets into libPlatform
Modified: trunk/Source/WTF/ChangeLog (150122 => 150123)
--- trunk/Source/WTF/ChangeLog 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/ChangeLog 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,3 +1,20 @@
+2013-05-15 Patrick Gansterer <[email protected]>
+
+ Consolidate lists in WTF CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=116142
+
+ Reviewed by Martin Robinson.
+
+ Move common files into the CMakeLists.txt to avoid duplicating the list of files.
+ Also rebase the recently added GTK files to match the other CMake ports, since
+ the submitted patch was based on an older version of the source tree.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformBlackBerry.cmake:
+ * wtf/PlatformEfl.cmake:
+ * wtf/PlatformGTK.cmake:
+ * wtf/PlatformWinCE.cmake:
+
2013-05-14 Carlos Garcia Campos <[email protected]>
Remove WTF_USE_PLATFORM_STRATEGIES
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (150122 => 150123)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-05-15 16:48:32 UTC (rev 150123)
@@ -214,6 +214,10 @@
"${CMAKE_BINARY_DIR}"
)
+set(APPEND WTF_LIBRARIES
+ ${CMAKE_DL_LIBS}
+)
+
if (WTF_USE_ICU_UNICODE)
list(APPEND WTF_HEADERS
unicode/icu/UnicodeIcu.h
@@ -238,6 +242,25 @@
)
endif ()
+if (WIN32)
+ list(APPEND WTF_SOURCES
+ OSAllocatorWin.cpp
+ ThreadSpecificWin.cpp
+ ThreadingWin.cpp
+
+ win/OwnPtrWin.cpp
+ )
+else ()
+ list(APPEND WTF_HEADERS
+ ThreadIdentifierDataPthreads.h
+ )
+ list(APPEND WTF_SOURCES
+ OSAllocatorPosix.cpp
+ ThreadIdentifierDataPthreads.cpp
+ ThreadingPthreads.cpp
+ )
+endif ()
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
Modified: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,8 +1,4 @@
list(APPEND WTF_SOURCES
- OSAllocatorPosix.cpp
- TCSystemAlloc.cpp
- ThreadIdentifierDataPthreads.cpp
- ThreadingPthreads.cpp
blackberry/MainThreadBlackBerry.cpp
)
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -2,12 +2,9 @@
efl/MainThreadEfl.cpp
efl/OwnPtrEfl.cpp
efl/RefPtrEfl.cpp
+
gobject/GOwnPtr.cpp
gobject/GRefPtr.cpp
-
- OSAllocatorPosix.cpp
- ThreadIdentifierDataPthreads.cpp
- ThreadingPthreads.cpp
)
list(APPEND WTF_LIBRARIES
@@ -21,7 +18,6 @@
${EINA_LIBRARIES}
${EO_LIBRARIES}
${EVAS_LIBRARIES}
- ${CMAKE_DL_LIBS}
)
list(APPEND WTF_INCLUDE_DIRECTORIES
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,19 +1,9 @@
list(APPEND WTF_SOURCES
- OSAllocatorPosix.cpp
- OSAllocatorWin.cpp
- ThreadIdentifierDataPthreads.cpp
- ThreadingPthreads.cpp
- ThreadingWin.cpp
-
gobject/GlibUtilities.cpp
gobject/GOwnPtr.cpp
gobject/GRefPtr.cpp
gtk/MainThreadGtk.cpp
-
- unicode/icu/CollatorICU.cpp
-
- win/OwnPtrWin.cpp
)
list(APPEND WTF_LIBRARIES
@@ -21,14 +11,10 @@
${GLIB_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
- ${ICU_LIBRARIES}
- ${ICU_I18N_LIBRARIES}
- ${CMAKE_DL_LIBS}
)
list(APPEND WTF_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
- ${ICU_INCLUDE_DIRS}
${_javascript_CORE_DIR}/wtf/gobject
${_javascript_CORE_DIR}/wtf/unicode
)
Modified: trunk/Source/WTF/wtf/PlatformWinCE.cmake (150122 => 150123)
--- trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/WTF/wtf/PlatformWinCE.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -1,12 +1,7 @@
list(APPEND WTF_SOURCES
- OSAllocatorWin.cpp
- ThreadingWin.cpp
- ThreadSpecificWin.cpp
-
threads/win/BinarySemaphoreWin.cpp
win/MainThreadWin.cpp
- win/OwnPtrWin.cpp
)
list(APPEND WTF_LIBRARIES
Modified: trunk/Source/cmake/OptionsGTK.cmake (150122 => 150123)
--- trunk/Source/cmake/OptionsGTK.cmake 2013-05-15 16:44:20 UTC (rev 150122)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-05-15 16:48:32 UTC (rev 150123)
@@ -75,6 +75,7 @@
set(ENABLE_INSPECTOR OFF)
set(ENABLE_PLUGIN_PROCESS OFF)
+set(WTF_USE_ICU_UNICODE 1)
set(WTF_USE_SOUP 1)
set(JSC_EXECUTABLE_NAME jsc)
set(WTF_LIBRARY_NAME WTFGTK)
