Skip to content

Commit ac0785c

Browse files
committed
Bump googletest to v1.14.0
This patch bumps GoogleTest to version 1.14.0
1 parent ff67955 commit ac0785c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+11918
-13496
lines changed

third-party/unittest/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ endif ()
7777
target_include_directories(llvm_gtest
7878
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/googletest/include>
7979
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/googlemock/include>
80-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/llvm-gtest/>
81-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/llvm-gmock/>
80+
$<INSTALL_INTERFACE:include/llvm-gtest/>
81+
$<INSTALL_INTERFACE:include/llvm-gmock/>
8282
PRIVATE googletest googlemock
8383
)
8484

8585
add_subdirectory(UnitTestMain)
8686

8787
if (LLVM_INSTALL_GTEST)
8888
install(TARGETS llvm_gtest llvm_gtest_main LLVMTestingSupport LLVMTestingAnnotations
89-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT llvm_gtest)
90-
install(DIRECTORY googletest/include/gtest/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-gtest/gtest/" COMPONENT llvm_gtest)
91-
install(DIRECTORY googlemock/include/gmock/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-gmock/gmock/" COMPONENT llvm_gtest)
89+
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT llvm_gtest)
90+
install(DIRECTORY googletest/include/gtest/ DESTINATION include/llvm-gtest/gtest/ COMPONENT llvm_gtest)
91+
install(DIRECTORY googlemock/include/gmock/ DESTINATION include/llvm-gmock/gmock/ COMPONENT llvm_gtest)
9292
endif()
9393

9494
# When LLVM_LINK_LLVM_DYLIB is enabled, libLLVM.so is added to the interface
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LLVM notes
22
----------
33

4-
This directory contains the 'googlemock' component of Google Test 1.10.0, with
4+
This directory contains the 'googlemock' component of Google Test 1.14.0, with
55
all elements removed except for the actual source code, to minimize the
66
addition to the LLVM distribution.
77

@@ -10,14 +10,10 @@ Cleaned up as follows:
1010
# Remove all the unnecessary files and directories
1111
$ rm -f CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README README.md .gitignore
1212
$ rm -rf build-aux make msvc scripts test docs
13-
$ rm -f `find . -name \*\.pump`
1413
$ rm -f src/gmock_main.cc
1514

1615
# Put the license in the consistent place for LLVM.
1716
$ mv LICENSE LICENSE.TXT
1817

1918
Modified as follows:
2019
* Support for std::begin/std::end in gmock-matchers.h
21-
* IWYU pragmas
22-
* Disabled -Wdeprecated-copy for clang
23-
* Added IWYU pragmas from https://github.com/google/googletest/commit/100f6fbf5f81a82d163c1e29735e8a2936eacd4f

0 commit comments

Comments
 (0)