diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-08-02 16:01:00 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-02 16:01:00 -0400 |
| commit | b7244ff37c1973f7bc9b41f9dc311de0813f580e (patch) | |
| tree | a6bb280e2ebcc50f69b437fd072210fca7e8a58d | |
| parent | 930f0f86e303227a9e794489db4e303bf2c22745 (diff) | |
| download | googletest-b7244ff37c1973f7bc9b41f9dc311de0813f580e.tar.gz googletest-b7244ff37c1973f7bc9b41f9dc311de0813f580e.tar.bz2 googletest-b7244ff37c1973f7bc9b41f9dc311de0813f580e.zip | |
cmake fixes
| -rw-r--r-- | googletest/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/Makefile.am | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index cd8c4501..4225b240 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -243,7 +243,7 @@ if (gtest_build_tests) cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}" gtest_main_use_own_tuple - test/googletest-param-test-test.cc test/gtest-param-test2_test.cc) + test/googletest-param-test-test.cc test/googletest-param-test2-test.cc) endif() ############################################################ @@ -271,7 +271,7 @@ if (gtest_build_tests) cxx_executable(googletest-color-test_ test gtest) py_test(gtest_color_test) - cxx_executable(gtest_env_var_test_ test gtest) + cxx_executable(googletest-env-var-test_ test gtest) py_test(gtest_env_var_test) cxx_executable(googletest-filter-unittest_ test gtest) diff --git a/googletest/Makefile.am b/googletest/Makefile.am index b32131d4..69c23120 100644 --- a/googletest/Makefile.am +++ b/googletest/Makefile.am @@ -53,8 +53,8 @@ EXTRA_DIST += \ test/gtest-listener_test.cc \ test/gtest-message_test.cc \ test/gtest-options_test.cc \ - test/gtest-param-test2_test.cc \ - test/gtest-param-test2_test.cc \ + test/googletest-param-test2-test.cc \ + test/googletest-param-test2-test.cc \ test/googletest-param-test-test.cc \ test/googletest-param-test-test.cc \ test/gtest-param-test_test.h \ @@ -70,7 +70,7 @@ EXTRA_DIST += \ test/googletest-break-on-failure-unittest_.cc \ test/googletest-catch-exceptions-test_.cc \ test/googletest-color-test_.cc \ - test/gtest_env_var_test_.cc \ + test/googletest-env-var-test_.cc \ test/gtest_environment_test.cc \ test/googletest-filter-unittest_.cc \ test/gtest_help_test_.cc \ |