Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Run the UpdateFromUpstream.sh script to extract upstream GoogleTest using the following shell commands. $ git archive --prefix=upstream-googletest/ 0fe96607 -- CMakeLists.txt googletest/CMakeLists.txt googletest/cmake googletest/src googletest/include | tar x google/googletest@ec44c6c...0fe9660 Change-Id: I4e658a82434af52048a5e0a1ab9ee4c034fa607b
- Loading branch information
GoogleTest Upstream
authored and
Francois Budin
committed
Dec 14, 2017
1 parent
3a41832
commit 5be14a5
Showing
20 changed files
with
442 additions
and
227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@ | ||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ | ||
|
||
Name: gtest | ||
Description: GoogleTest (without main() function) | ||
Version: @PROJECT_VERSION@ | ||
URL: https://github.com/google/googletest | ||
Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ | ||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@ | ||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ | ||
|
||
Name: gtest_main | ||
Description: GoogleTest (with main() function) | ||
Version: @PROJECT_VERSION@ | ||
URL: https://github.com/google/googletest | ||
Requires: gtest | ||
Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ | ||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.