diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:26 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-15 17:34:27 -0400 |
| commit | 4083746e61ae8ca9c06c1d4a5a759920095dd209 (patch) | |
| tree | cc12f92ee18f226c07dc9d7193be5dbfb8325968 /googlemock | |
| parent | 9b70406919faddd764cb73b9d0ebb118c0a386ea (diff) | |
| parent | 6dbddd32b053084754a0be210051b932d74b181d (diff) | |
| download | googletest-4083746e61ae8ca9c06c1d4a5a759920095dd209.tar.gz googletest-4083746e61ae8ca9c06c1d4a5a759920095dd209.tar.bz2 googletest-4083746e61ae8ca9c06c1d4a5a759920095dd209.zip | |
Merge pull request #2391 from adambadura:FixCygwin
PiperOrigin-RevId: 263574695
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index f75ec45d..d32b70b5 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -150,6 +150,14 @@ $env:Path = \"$project_bin;$env:Path\" & $args") endif() + if (MINGW OR CYGWIN) + if (CMAKE_VERSION VERSION_LESS "2.8.12") + add_compile_options("-Wa,-mbig-obj") + else() + add_definitions("-Wa,-mbig-obj") + endif() + endif() + ############################################################ # C++ tests built with standard compiler flags. @@ -162,9 +170,6 @@ $env:Path = \"$project_bin;$env:Path\" 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 OR CYGWIN) - 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) |