diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-20 14:30:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 14:30:26 -0400 |
| commit | 90943525c5d1fa4362cbc5c4b313dab761c02295 (patch) | |
| tree | ffef3579c23a986ad65dab298550d62e6302cd00 /googlemock | |
| parent | 149c0d24148da9a339d6c9d03e638a39c59731f6 (diff) | |
| parent | 258def01a68e3a4d080fee6d4502035218e61e38 (diff) | |
| download | googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.tar.gz googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.tar.bz2 googletest-90943525c5d1fa4362cbc5c4b313dab761c02295.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 8a8de1f6..2a913080 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -157,6 +157,9 @@ if (gmock_build_tests) cxx_test(gmock-generated-matchers_test gmock_main) cxx_test(gmock-internal-utils_test gmock_main) cxx_test(gmock-matchers_test gmock_main) + if (MINGW) + target_compile_options(gmock-matchers_test PRIVATE "-Wa,-mbig-obj") + endif() cxx_test(gmock-more-actions_test gmock_main) cxx_test(gmock-nice-strict_test gmock_main) cxx_test(gmock-port_test gmock_main) |