[CMake] Build fix for USE_SYSTEM_MALLOC after r113570.

.:

* Source/cmakeconfig.h.cmake:

Source/WTF:

* wtf/CMakeLists.txt:

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

diff --git a/ChangeLog b/ChangeLog
index dc7e200..a1f954f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-09  Patrick Gansterer  <paroga@webkit.org>
 
+        [CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
+
+        * Source/cmakeconfig.h.cmake:
+
+2012-04-09  Patrick Gansterer  <paroga@webkit.org>
+
         [CMake] Share build system options across ports
         https://bugs.webkit.org/show_bug.cgi?id=72815
 

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 7b310f3..b5b2a43 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-09  Patrick Gansterer  <paroga@webkit.org>
 
+        [CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
+
+        * wtf/CMakeLists.txt:
+
+2012-04-09  Patrick Gansterer  <paroga@webkit.org>
+
         Remove HAVE_STDINT_H
         https://bugs.webkit.org/show_bug.cgi?id=83434
 

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index d316eaf..4411326 100644 (file)
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -193,9 +193,7 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
 )
 
-IF (USE_SYSTEM_MALLOC)
-    ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
-ELSE ()
+IF (NOT USE_SYSTEM_MALLOC)
     LIST(APPEND WTF_SOURCES
         TCSystemAlloc.cpp
     )

diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
index ed2770b..180d57d 100644 (file)
--- a/Source/cmakeconfig.h.cmake
+++ b/Source/cmakeconfig.h.cmake
@@ -68,5 +68,6 @@
 #cmakedefine01 ENABLE_WEB_TIMING
 #cmakedefine01 ENABLE_WORKERS
 #cmakedefine01 ENABLE_XSLT
+#cmakedefine01 USE_SYSTEM_MALLOC
 
 #endif /* CMAKECONFIG_H */