[webkit-changes] [WebKit/WebKit] 14adb9: Build fix: add gtest dependency to gmock project

Commit Queue noreply at github.com
Fri Oct 20 13:04:14 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 14adb9294c87dee26eddf41b4dcdc07c50389fd1
      https://github.com/WebKit/WebKit/commit/14adb9294c87dee26eddf41b4dcdc07c50389fd1
  Author: David Kilzer <ddkilzer at apple.com>
  Date:   2023-10-20 (Fri, 20 Oct 2023)

  Changed paths:
    R Source/ThirdParty/gmock/Configurations/gmock_main.xcconfig
    M Source/ThirdParty/gmock/gmock.xcodeproj/project.pbxproj
    M Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Build fix: add gtest dependency to gmock project
https://bugs.webkit.org/show_bug.cgi?id=263448
<rdar://117266314>

Reviewed by Elliott Williams.

Summary of changes:
- To fix the gmock build, add a "fake" dependency to the gmock target to
  libgtest.a by creating a "Copy Files" build phase script named
  "Product Dependencies".  This mimics what the WTF project does for
  libbmalloc.a and libWebKitAdditions.a.
- Add two "Copy Files" build phase scripts to the gtest-static target so
  that internal and internal/custom headers are copied into
  $(BUILT_PRODUCTS_DIR)/usr/local/include/gtest.  We can eventually
  remove gtest-framework since nothing links to it--it is only used for
  including headers.
- Remove the gmock_main target added in 269490 at main since it is not
  currently used.

* Source/ThirdParty/gmock/Configurations/gmock_main.xcconfig: Remove.
* Source/ThirdParty/gmock/gmock.xcodeproj/project.pbxproj:
- Remove gtest_main target and xcconfig file.
- Add "Product Dependencies" build phase script to create a dependency
  on gtest-static when building from a workspace.  This fixes the build.
* Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj:
- Install internal and internal/custom headers with gtest-static target
  into $(BUILT_PRODUCTS_DIR)/usr/local/include/gtest.
- Remove project headers for gtest-framework target since internal and
  internal/custom paths are not preserved, and gtest.h is a duplicate
  name.

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




More information about the webkit-changes mailing list