[GTK][WPE] Fix MALLOC_HEAP_BREAKDOWN builds

Scony · Scony · commit 62855af639a3 · 2025-05-13T08:31:22.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=292929 Reviewed by Adrian Perez de Castro. This change fixes malloc heap breakdown compilation on GTK and WPE ports. It also cleans up cmake files a bit as in the end the library that serves malloc heap breakdown is not a framework. * Source/WebCore/CMakeLists.txt: * Source/WebKit/CMakeLists.txt: * Source/bmalloc/CMakeLists.txt: * Source/cmake/OptionsGTK.cmake: * Source/cmake/OptionsWPE.cmake: * Source/cmake/WebKitFS.cmake: * Tools/TestWebKitAPI/CMakeLists.txt: Canonical link: https://commits.webkit.org/294848@main
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
@@ -2625,11 +2625,10 @@ if (PORT STREQUAL GTK OR PORT STREQUAL WPE)
 endif ()
 
 if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    list(APPEND WebCore_FRAMEWORKS ${MALLOC_HEAP_BREAKDOWN_FRAMEWORKS})
+    list(APPEND WebCore_LIBRARIES ${MALLOC_HEAP_BREAKDOWN_LIBRARIES})
 endif ()
 
 list(APPEND WebCoreTestSupport_LIBRARIES ${WebCore_LIBRARIES})
-list(APPEND WebCoreTestSupport_FRAMEWORKS ${WebCore_FRAMEWORKS})
 list(APPEND WebCoreTestSupport_PRIVATE_LIBRARIES ${WebCore_PRIVATE_LIBRARIES})
 list(APPEND WebCoreTestSupport_DEPENDENCIES WebCore)
 
diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
@@ -725,10 +725,6 @@ if (NOT USE_SYSTEM_MALLOC)
     list(APPEND WebKit_FRAMEWORKS bmalloc)
 endif ()
 
-if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    list(APPEND WebKit_FRAMEWORKS ${MALLOC_HEAP_BREAKDOWN_FRAMEWORKS})
-endif ()
-
 set(WebProcess_LIBRARIES WebKit)
 set(NetworkProcess_LIBRARIES WebKit)
 set(GPUProcess_LIBRARIES WebKit)
diff --git a/Source/bmalloc/CMakeLists.txt b/Source/bmalloc/CMakeLists.txt
@@ -697,7 +697,7 @@ set(bmalloc_LIBRARIES
 )
 
 if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    list(APPEND bmalloc_FRAMEWORKS ${MALLOC_HEAP_BREAKDOWN_FRAMEWORKS})
+    list(APPEND bmalloc_LIBRARIES ${MALLOC_HEAP_BREAKDOWN_LIBRARIES})
 endif ()
 
 if (ATOMICS_REQUIRE_LIBATOMIC)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
@@ -445,7 +445,7 @@ if (APPLE)
 endif ()
 
 if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    set(MALLOC_HEAP_BREAKDOWN_FRAMEWORKS MallocHeapBreakdown)
+    set(MALLOC_HEAP_BREAKDOWN_LIBRARIES MallocHeapBreakdown)
 endif ()
 
 # Using DERIVED_SOURCES_DIR is deprecated
diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
@@ -424,7 +424,7 @@ if (USE_LIBBACKTRACE)
 endif ()
 
 if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    set(MALLOC_HEAP_BREAKDOWN_FRAMEWORKS MallocHeapBreakdown)
+    set(MALLOC_HEAP_BREAKDOWN_LIBRARIES MallocHeapBreakdown)
 endif ()
 
 # Using DERIVED_SOURCES_DIR is deprecated
diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
@@ -45,7 +45,6 @@ set(TestRunnerShared_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/TestRunnerShared/D
 set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DumpRenderTree/DerivedSources")
 set(WebKitTestRunner_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebKitTestRunner/DerivedSources")
 
-set(MallocHeapBreakdown_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/MallocHeapBreakdown/Headers")
 set(bmalloc_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/bmalloc/Headers")
 set(ANGLE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/ANGLE/Headers")
 set(Skia_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/Skia/Headers")
diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
@@ -151,10 +151,6 @@ if (NOT USE_SYSTEM_MALLOC)
     list(APPEND TestWTF_FRAMEWORKS bmalloc)
 endif ()
 
-if (ENABLE_MALLOC_HEAP_BREAKDOWN)
-    list(APPEND TestWTF_FRAMEWORKS ${MALLOC_HEAP_BREAKDOWN_FRAMEWORKS})
-endif ()
-
 WEBKIT_EXECUTABLE_DECLARE(TestWTF)
 
 # TestJavaScriptCore definitions

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ set(bmalloc_LIBRARIES`
`697`	`697`	`)`
`698`	`698`
`699`	`699`	`if (ENABLE_MALLOC_HEAP_BREAKDOWN)`
`700`		`- list(APPEND bmalloc_FRAMEWORKS ${MALLOC_HEAP_BREAKDOWN_FRAMEWORKS})`
	`700`	`+ list(APPEND bmalloc_LIBRARIES ${MALLOC_HEAP_BREAKDOWN_LIBRARIES})`
`701`	`701`	`endif ()`
`702`	`702`
`703`	`703`	`if (ATOMICS_REQUIRE_LIBATOMIC)`