Title: [195183] trunk
- Revision
- 195183
- Author
- [email protected]
- Date
- 2016-01-17 10:09:19 -0800 (Sun, 17 Jan 2016)
Log Message
[CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
https://bugs.webkit.org/show_bug.cgi?id=153190
Reviewed by Csaba Osztrogonác.
Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
.:
* Source/CMakeLists.txt:
* Source/cmake/OptionsWin.cmake:
Source/WTF:
* wtf/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (195182 => 195183)
--- trunk/ChangeLog 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/ChangeLog 2016-01-17 18:09:19 UTC (rev 195183)
@@ -1,3 +1,15 @@
+2016-01-17 Michael Catanzaro <[email protected]>
+
+ [CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
+ https://bugs.webkit.org/show_bug.cgi?id=153190
+
+ Reviewed by Csaba Osztrogonác.
+
+ Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
+
+ * Source/CMakeLists.txt:
+ * Source/cmake/OptionsWin.cmake:
+
2016-01-16 Jeremy Huddleston Sequoia <[email protected]>
[GTK] Use -Wl,-all_load on darwin to include contents of all static archives
Modified: trunk/Source/CMakeLists.txt (195182 => 195183)
--- trunk/Source/CMakeLists.txt 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/CMakeLists.txt 2016-01-17 18:09:19 UTC (rev 195183)
@@ -1,8 +1,7 @@
# -----------------------------------------------------------------------------
# Add module directories
# -----------------------------------------------------------------------------
-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
+if (NOT USE_SYSTEM_MALLOC)
add_subdirectory(bmalloc)
endif ()
@@ -33,8 +32,7 @@
# -----------------------------------------------------------------------------
# Set compiler flags for all targets
# -----------------------------------------------------------------------------
-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
+if (NOT USE_SYSTEM_MALLOC)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(bmalloc ${ADDITIONAL_COMPILER_FLAGS})
endif ()
WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_COMPILER_FLAGS})
Modified: trunk/Source/WTF/ChangeLog (195182 => 195183)
--- trunk/Source/WTF/ChangeLog 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/WTF/ChangeLog 2016-01-17 18:09:19 UTC (rev 195183)
@@ -1,3 +1,14 @@
+2016-01-17 Michael Catanzaro <[email protected]>
+
+ [CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
+ https://bugs.webkit.org/show_bug.cgi?id=153190
+
+ Reviewed by Csaba Osztrogonác.
+
+ Build bmalloc when NOT USE_SYSTEM_MALLOC rather than when NOT WIN32.
+
+ * wtf/CMakeLists.txt:
+
2016-01-15 Simon Fraser <[email protected]>
Add kdebug_trace signposts for a few WebCore operations
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (195182 => 195183)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-17 18:09:19 UTC (rev 195183)
@@ -249,8 +249,7 @@
)
endif ()
-# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
-if (NOT WIN32)
+if (NOT USE_SYSTEM_MALLOC)
list(APPEND WTF_LIBRARIES bmalloc)
endif ()
Modified: trunk/Source/cmake/OptionsWin.cmake (195182 => 195183)
--- trunk/Source/cmake/OptionsWin.cmake 2016-01-17 09:15:45 UTC (rev 195182)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-01-17 18:09:19 UTC (rev 195183)
@@ -79,6 +79,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
+# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON)
if (${WTF_PLATFORM_WIN_CAIRO})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
