Title: [295310] trunk/Tools/WebKitTestRunner/CMakeLists.txt
- Revision
- 295310
- Author
- don.olmst...@sony.com
- Date
- 2022-06-06 17:58:59 -0700 (Mon, 06 Jun 2022)
Log Message
[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
Modified Paths
Diff
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (295309 => 295310)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2022-06-07 00:35:58 UTC (rev 295309)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2022-06-07 00:58:59 UTC (rev 295310)
@@ -19,15 +19,19 @@
WorkQueueManager.cpp
)
-set(WebKitTestRunner_LIBRARIES
- TestRunnerShared
-)
+set(WebKitTestRunner_LIBRARIES TestRunnerShared)
+
set(WebKitTestRunner_FRAMEWORKS
_javascript_Core
+ PAL
+ WTF
WebCore
WebCoreTestSupport
WebKit
)
+if (NOT USE_SYSTEM_MALLOC)
+ list(APPEND WebKitTestRunner_FRAMEWORKS bmalloc)
+endif ()
if (COMPILER_IS_GCC_OR_CLANG)
if (HAVE_STD_EXPERIMENTAL_FILESYSTEM)
@@ -45,14 +49,6 @@
${WebKitTestRunner_UISCRIPTCONTEXT_DIR}
)
-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
- ${WEBCORE_DIR}/testing/js
-)
-
-list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
- ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
-)
-
set(WebKitTestRunner_WEB_PREFERENCES_TEMPLATES
${WebKitTestRunner_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
)
@@ -99,10 +95,6 @@
${WebKitTestRunner_DIR}/InjectedBundle
)
-list(APPEND WebKitTestRunnerInjectedBundle_INCLUDE_DIRECTORIES
- ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
-)
-
set(WebKitTestRunnerInjectedBundle_LIBRARIES
TestRunnerShared
WebKit::WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
