Merge r180264 - Build bmalloc through CMake as a static library. It's…

… then linked either

into the WTF library (if built as a shared library) or into the JSC and
WebKit2 libraries. There's no need to build it as a standalone shared library.

Rubber-stamped by Carlos Garcia Campos.

* CMakeLists.txt:

Source/bmalloc/CMakeLists.txt

@@ -17,6 +17,6 @@ set(bmalloc_SOURCES
 
 WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
 include_directories(${bmalloc_INCLUDE_DIRECTORIES})
-add_library(bmalloc ${bmalloc_SOURCES})
+add_library(bmalloc STATIC ${bmalloc_SOURCES})
 target_link_libraries(bmalloc ${bmalloc_LIBRARIES})
 set_target_properties(bmalloc PROPERTIES COMPILE_DEFINITIONS "BUILDING_bmalloc")

Source/bmalloc/ChangeLog

@@ -1,3 +1,13 @@
+2015-02-18  Zan Dobersek  <zdobersek@igalia.com>
+
+        Build bmalloc through CMake as a static library. It's then linked either
+        into the WTF library (if built as a shared library) or into the JSC and
+        WebKit2 libraries. There's no need to build it as a standalone shared library.
+
+        Rubber-stamped by Carlos Garcia Campos.
+
+        * CMakeLists.txt:
+
 2015-02-13  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [BMalloc] Add a FIXME comment for memory alignas