Changeset 295341 in webkit

Timestamp:

Jun 7, 2022, 4:42:59 AM (4 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r295310 - [CMake] Cleanup use of frameworks in WebKitTestRunner
​https://bugs.webkit.org/show_bug.cgi?id=241349

Reviewed by Fujii Hironori.

Remove includes that are implicit from using a framework.

• Tools/WebKitTestRunner/CMakeLists.txt:

Canonical link: ​https://commits.webkit.org/251348@main

File:

• releases/WebKitGTK/webkit-2.36/Tools/WebKitTestRunner/CMakeLists.txt (modified) (3 diffs)

releases/WebKitGTK/webkit-2.36/Tools/WebKitTestRunner/CMakeLists.txt

@@ -20 +20 @@
 )
 
-set(WebKitTestRunner_LIBRARIES
-    TestRunnerShared
-)
+set(WebKitTestRunner_LIBRARIES TestRunnerShared)
+
 set(WebKitTestRunner_FRAMEWORKS
     JavaScriptCore
+    PAL
+    WTF
     WebCore
     WebCoreTestSupport
     WebKit
 )
+if (NOT USE_SYSTEM_MALLOC)
+    list(APPEND WebKitTestRunner_FRAMEWORKS bmalloc)
+endif ()
 
 if (COMPILER_IS_GCC_OR_CLANG)
@@ -44 +48 @@
     ${WebKitTestRunner_DIR}
     ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
-)
-
-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
-    ${WEBCORE_DIR}/testing/js
-)
-
-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
-    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
 )
 
@@ -100 +96 @@
 )
 
-list(APPEND WebKitTestRunnerInjectedBundle_INCLUDE_DIRECTORIES
-    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
-)
-
 set(WebKitTestRunnerInjectedBundle_LIBRARIES
     TestRunnerShared