Skip to content

Commit

Permalink
[gtest][CMake] Compile the unified source gtest-all.cc
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=259090

Reviewed by Yusuke Suzuki.

clang-cl reported the following warning for Windows port:
> ThirdParty\gtest\src\gtest-filepath.cc(68,12): warning: unused variable 'kAlternatePathSeparatorString' [-Wunused-const-variable]

clang-cl doesn't report this warning for the upstream google-test
because it's using gtest-all.cc. Let's use it in WebKit.

* Source/ThirdParty/gtest/CMakeLists.txt:

Canonical link: https://commits.webkit.org/266025@main
  • Loading branch information
fujii committed Jul 13, 2023
1 parent 1ace3d3 commit 805f2b5
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions Source/ThirdParty/gtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ set(GTEST_INCLUDE_DIRECTORIES
)

set(GTEST_SOURCES
${GTEST_DIR}/src/gtest.cc
${GTEST_DIR}/src/gtest-death-test.cc
${GTEST_DIR}/src/gtest-filepath.cc
${GTEST_DIR}/src/gtest-all.cc
${GTEST_DIR}/src/gtest_main.cc
${GTEST_DIR}/src/gtest-matchers.cc
${GTEST_DIR}/src/gtest-port.cc
${GTEST_DIR}/src/gtest-printers.cc
${GTEST_DIR}/src/gtest-test-part.cc
${GTEST_DIR}/src/gtest-typed-test.cc
)

set(gtest_DEFINITIONS GTEST_HAS_RTTI=0)
Expand Down

0 comments on commit 805f2b5

Please sign in to comment.