Changeset 195183 in webkit

Timestamp:

Jan 17, 2016 10:09:19 AM (8 years ago)

Author:

Michael Catanzaro

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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/CMakeLists.txt (modified) (2 diffs)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CMakeLists.txt (modified) (1 diff)
• Source/cmake/OptionsWin.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <jeremyhu@apple.com>
 

trunk/Source/CMakeLists.txt

@@ -2 +2 @@
 # 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 ()
@@ -34 +33 @@
 # 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 ()

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <simon.fraser@apple.com>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -250 +250 @@
 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 ()

trunk/Source/cmake/OptionsWin.cmake

@@ -80 +80 @@
 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)