Title: [113574] trunk
- Revision
- 113574
- Author
- [email protected]
- Date
- 2012-04-09 05:35:56 -0700 (Mon, 09 Apr 2012)
Log Message
[CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
.:
* Source/cmakeconfig.h.cmake:
Source/WTF:
* wtf/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (113573 => 113574)
--- trunk/ChangeLog 2012-04-09 11:42:18 UTC (rev 113573)
+++ trunk/ChangeLog 2012-04-09 12:35:56 UTC (rev 113574)
@@ -1,5 +1,11 @@
2012-04-09 Patrick Gansterer <[email protected]>
+ [CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
+
+ * Source/cmakeconfig.h.cmake:
+
+2012-04-09 Patrick Gansterer <[email protected]>
+
[CMake] Share build system options across ports
https://bugs.webkit.org/show_bug.cgi?id=72815
Modified: trunk/Source/WTF/ChangeLog (113573 => 113574)
--- trunk/Source/WTF/ChangeLog 2012-04-09 11:42:18 UTC (rev 113573)
+++ trunk/Source/WTF/ChangeLog 2012-04-09 12:35:56 UTC (rev 113574)
@@ -1,5 +1,11 @@
2012-04-09 Patrick Gansterer <[email protected]>
+ [CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
+
+ * wtf/CMakeLists.txt:
+
+2012-04-09 Patrick Gansterer <[email protected]>
+
Remove HAVE_STDINT_H
https://bugs.webkit.org/show_bug.cgi?id=83434
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (113573 => 113574)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-09 11:42:18 UTC (rev 113573)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-09 12:35:56 UTC (rev 113574)
@@ -193,9 +193,7 @@
"${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
)
Modified: trunk/Source/cmakeconfig.h.cmake (113573 => 113574)
--- trunk/Source/cmakeconfig.h.cmake 2012-04-09 11:42:18 UTC (rev 113573)
+++ trunk/Source/cmakeconfig.h.cmake 2012-04-09 12:35:56 UTC (rev 113574)
@@ -68,5 +68,6 @@
#cmakedefine01 ENABLE_WEB_TIMING
#cmakedefine01 ENABLE_WORKERS
#cmakedefine01 ENABLE_XSLT
+#cmakedefine01 USE_SYSTEM_MALLOC
#endif /* CMAKECONFIG_H */
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
