[webkit-changes] [WebKit/WebKit] 09e747: [CMake] Add WEBKIT_LIBRARY macro

Don Olmstead noreply at github.com
Wed Jan 25 08:05:54 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 09e747915b844571398e237245094cdaae62396a
      https://github.com/WebKit/WebKit/commit/09e747915b844571398e237245094cdaae62396a
  Author: Don Olmstead <don.olmstead at sony.com>
  Date:   2023-01-25 (Wed, 25 Jan 2023)

  Changed paths:
    M Source/WebCore/CMakeLists.txt
    M Source/cmake/WebKitMacros.cmake
    M Tools/CMakeLists.txt
    M Tools/DumpRenderTree/CMakeLists.txt
    M Tools/TestRunnerShared/CMakeLists.txt
    M Tools/WebKitTestRunner/CMakeLists.txt
    M Tools/WebKitTestRunner/PlatformGTK.cmake
    M Tools/WebKitTestRunner/PlatformMac.cmake
    M Tools/WebKitTestRunner/PlatformWPE.cmake
    M Tools/WebKitTestRunner/PlatformWin.cmake
    M Tools/wpe/backends/CMakeLists.txt

  Log Message:
  -----------
  [CMake] Add WEBKIT_LIBRARY macro
https://bugs.webkit.org/show_bug.cgi?id=250055

Reviewed by Fujii Hironori.

When using `WEBKIT_FRAMEWORK` with WebCoreTestSupport it caused objects
from JavaScriptCore and lower to be linked in when JavaScriptCore was
not a `SHARED` library. To work around this add `WEBKIT_LIBRARY` which
will not link its frameworks but will be able to get at their headers
still.

Migrate `WebCoreTestSupport`, `TestRunnerShared` and `WPEToolingBackend`
over to use `WEBKIT_LIBRARY` instead. Also move around some declarations
of `WebCoreTestSupport` before the `WEBKIT_FRAMEWORK` call on `WebCore`.
This was also introducing in objects.

Use `WEBKIT_LIBRARY` for the TestRunnerInjectedBundle target. Change the
naming conventions to match that and reorganize declarations so they're
all next to each other.

* Source/WebCore/CMakeLists.txt:
* Source/cmake/WebKitMacros.cmake:
* Tools/CMakeLists.txt:
* Tools/DumpRenderTree/CMakeLists.txt:
* Tools/TestRunnerShared/CMakeLists.txt:
* Tools/WebKitTestRunner/CMakeLists.txt:
* Tools/WebKitTestRunner/PlatformGTK.cmake:
* Tools/WebKitTestRunner/PlatformMac.cmake:
* Tools/WebKitTestRunner/PlatformWPE.cmake:
* Tools/WebKitTestRunner/PlatformWin.cmake:
* Tools/wpe/backends/CMakeLists.txt:

Canonical link: https://commits.webkit.org/259358@main




More information about the webkit-changes mailing list