summaryrefslogtreecommitdiffstats
path: root/googletest/CMakeLists.txt
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-08-02 18:56:33 (GMT)
committerGennadiy Civil <misterg@google.com>2018-08-02 18:56:33 (GMT)
commitf3511bf1c703c31c226cab29bd04106cdeb5f2ac (patch)
tree2618d7202a567d52195ba3cb53aca6bd4d70d482 /googletest/CMakeLists.txt
parentbbc0ac9b1ad90693a31e177b952cc37e30704911 (diff)
downloadgoogletest-f3511bf1c703c31c226cab29bd04106cdeb5f2ac.zip
googletest-f3511bf1c703c31c226cab29bd04106cdeb5f2ac.tar.gz
googletest-f3511bf1c703c31c226cab29bd04106cdeb5f2ac.tar.bz2
cleaning up and adding test changes to CMake
Diffstat (limited to 'googletest/CMakeLists.txt')
-rw-r--r--googletest/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index 518572f..0e0e4ca 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -239,11 +239,11 @@ if (gtest_build_tests)
src/gtest-all.cc src/gtest_main.cc)
cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}"
- gtest_main_use_own_tuple test/gtest-tuple_test.cc)
+ gtest_main_use_own_tuple test/googletest-tuple-test.cc)
cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}"
gtest_main_use_own_tuple
- test/gtest-param-test_test.cc test/gtest-param-test2_test.cc)
+ test/googletest-param-test-test.cc test/gtest-param-test2_test.cc)
endif()
############################################################
@@ -258,14 +258,14 @@ if (gtest_build_tests)
gtest_catch_exceptions_no_ex_test_
"${cxx_no_exception}"
gtest_main_no_exception
- test/gtest_catch_exceptions_test_.cc)
+ test/googletest-catch-exceptions-test_.cc)
endif()
cxx_executable_with_flags(
gtest_catch_exceptions_ex_test_
"${cxx_exception}"
gtest_main
- test/gtest_catch_exceptions_test_.cc)
+ test/googletest-catch-exceptions-test_.cc)
py_test(gtest_catch_exceptions_test)
cxx_executable(gtest_color_test_ test gtest)