aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-09-20 11:42:02 -0400
committerGitHub <noreply@github.com>2018-09-20 11:42:02 -0400
commit09560fba443c07cca2d100f5baaf7d651af58f81 (patch)
tree01548f135a13dbccdf65499d18f171a30546a00d
parent4f55245183ff0c970f828a38e4aa9d2d24bc99be (diff)
parent0a18c106ac0a794b9d912d46b5de20634b14703b (diff)
downloadgoogletest-09560fba443c07cca2d100f5baaf7d651af58f81.tar.gz
googletest-09560fba443c07cca2d100f5baaf7d651af58f81.tar.bz2
googletest-09560fba443c07cca2d100f5baaf7d651af58f81.zip
Merge pull request #1844 from matlo607/fix-msys-build-gmock-matchers_test
[msys] pass big object file option to assembler for target gmock-matchers_test
-rw-r--r--googlemock/CMakeLists.txt3
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)