[cmake] Deduplicated bmalloc/Zone.cpp handling.
authorannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2016 16:05:25 +0000 (16:05 +0000)
committerannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2016 16:05:25 +0000 (16:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158154

Reviewed by Alex Christensen.

File bmalloc/Zone.cpp is required on Darwin irrespectively from what
port is being built.

Also I removed WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() because it's
unlikely that bmalloc will ever need port-specific customizations (as
opposed to OS-specific customizations which should be done in
CMakeLists.txt).

* CMakeLists.txt: Added bmalloc/Zone.cpp for Darwin.
* PlatformGTK.cmake: Removed.
* PlatformMac.cmake: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@201452 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/bmalloc/CMakeLists.txt
Source/bmalloc/ChangeLog
Source/bmalloc/PlatformGTK.cmake [deleted file]
Source/bmalloc/PlatformMac.cmake [deleted file]

index 337c8c1..39a404b 100644 (file)
@@ -18,12 +18,16 @@ set(bmalloc_SOURCES
     bmalloc/mbmalloc.cpp
 )
 
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    list(APPEND bmalloc_SOURCES
+        bmalloc/Zone.cpp
+    )
+endif ()
+
 set(bmalloc_LIBRARIES
     ${CMAKE_DL_LIBS}
 )
 
-WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-
 WEBKIT_WRAP_SOURCELIST(${bmalloc_SOURCES})
 include_directories(${bmalloc_INCLUDE_DIRECTORIES})
 add_library(bmalloc STATIC ${bmalloc_SOURCES})
index a7405d7..cbb769e 100644 (file)
@@ -1,3 +1,22 @@
+2016-05-27  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Deduplicated bmalloc/Zone.cpp handling.
+        https://bugs.webkit.org/show_bug.cgi?id=158154
+
+        Reviewed by Alex Christensen.
+
+        File bmalloc/Zone.cpp is required on Darwin irrespectively from what
+        port is being built.
+
+        Also I removed WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() because it's
+        unlikely that bmalloc will ever need port-specific customizations (as
+        opposed to OS-specific customizations which should be done in
+        CMakeLists.txt).
+
+        * CMakeLists.txt: Added bmalloc/Zone.cpp for Darwin.
+        * PlatformGTK.cmake: Removed.
+        * PlatformMac.cmake: Removed.
+
 2016-05-22  Brady Eidson  <beidson@apple.com>
 
         Move to C++14.
diff --git a/Source/bmalloc/PlatformGTK.cmake b/Source/bmalloc/PlatformGTK.cmake
deleted file mode 100644 (file)
index d551010..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    list(APPEND bmalloc_SOURCES
-        bmalloc/Zone.cpp
-    )
-endif ()
diff --git a/Source/bmalloc/PlatformMac.cmake b/Source/bmalloc/PlatformMac.cmake
deleted file mode 100644 (file)
index 8f6cc36..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND bmalloc_SOURCES
-    bmalloc/Zone.cpp
-)
\ No newline at end of file