aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/CMakeLists.txt
diff options
context:
space:
mode:
authorArseny Aprelev <arseny.aprelev@gmail.com>2018-10-01 16:47:09 -0400
committerGennadiy Civil <misterg@google.com>2018-10-02 13:03:28 -0400
commit00938b2b228f3b70d3d9e51f29a1505bdad43f1e (patch)
tree2bebc032627672911353925d14d1fce101a36029 /googletest/CMakeLists.txt
parent2e91bbcf6f33eb85451001be2d4c95cca86ea9fc (diff)
downloadgoogletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.tar.gz
googletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.tar.bz2
googletest-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.zip
Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d19aa373b428c7c746f951737354c28
Closes #1544 With refinements and changes PiperOrigin-RevId: 215273083
Diffstat (limited to 'googletest/CMakeLists.txt')
-rw-r--r--googletest/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index 9ee79408..e4e99e83 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -217,6 +217,7 @@ if (gtest_build_tests)
test/gtest-typed-test2_test.cc)
cxx_test(gtest_unittest gtest_main)
cxx_test(gtest-unittest-api_test gtest)
+ cxx_test(gtest_skip_test gtest_main)
############################################################
# C++ tests built with non-standard compiler flags.