diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-08-09 18:19:15 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-08-09 18:19:15 +0000 |
| commit | 5c4b472bbf8c81fc3d52fc69a92f174821a96280 (patch) | |
| tree | cb61bdc699ce42b01ae571b3021d7c3a66188311 /CMakeLists.txt | |
| parent | 7c598c4f1a44fdda5f97587484c85bef9e93fa98 (diff) | |
| download | googletest-5c4b472bbf8c81fc3d52fc69a92f174821a96280.tar.gz googletest-5c4b472bbf8c81fc3d52fc69a92f174821a96280.tar.bz2 googletest-5c4b472bbf8c81fc3d52fc69a92f174821a96280.zip | |
Makes gtest print enums as integers instead of hex dumps (by Zhanyong Wan); improves the hex dump format (by Zhanyong Wan); gets rid of class TestInfoImpl (by Zhanyong Wan); adds exception handling (by Vlad Losev).
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a978a1a..316d257d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,6 +142,8 @@ if (gtest_build_tests) cxx_library(gtest_no_exception "${cxx_no_exception}" src/gtest-all.cc) + cxx_library(gtest_main_no_exception "${cxx_no_exception}" + src/gtest-all.cc src/gtest_main.cc) cxx_library(gtest_main_no_rtti "${cxx_no_rtti}" src/gtest-all.cc src/gtest_main.cc) @@ -180,6 +182,18 @@ if (gtest_build_tests) cxx_executable(gtest_break_on_failure_unittest_ test gtest) py_test(gtest_break_on_failure_unittest) + cxx_executable_with_flags( + gtest_catch_exceptions_no_ex_test_ + "${cxx_no_exception}" + gtest_main_no_exception + test/gtest_catch_exceptions_test_.cc) + cxx_executable_with_flags( + gtest_catch_exceptions_ex_test_ + "${cxx_exception}" + gtest_main + test/gtest_catch_exceptions_test_.cc) + py_test(gtest_catch_exceptions_test) + cxx_executable(gtest_color_test_ test gtest) py_test(gtest_color_test) |