gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2391 from adambadura:FixCygwin

Browse Source 
PiperOrigin-RevId: 263574695
This commit is contained in:
Gennadiy Civil
2019-08-15 17:34:26 -04:00
parent 9b70406919 6dbddd32b0
commit 4083746e61
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
googlemock/CMakeLists.txt
View File

@@ -150,6 +150,14 @@ $env:Path = \"$project_bin;$env:Path\"
& $args") & $args")
endif() 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. # 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-generated-matchers_test gmock_main)
cxx_test(gmock-internal-utils_test gmock_main) cxx_test(gmock-internal-utils_test gmock_main)
cxx_test(gmock-matchers_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-more-actions_test gmock_main)
cxx_test(gmock-nice-strict_test gmock_main) cxx_test(gmock-nice-strict_test gmock_main)
cxx_test(gmock-port_test gmock_main) cxx_test(gmock-port_test gmock_main)