diff options
| author | Adam Badura <adam.f.badura@gmail.com> | 2019-07-11 21:22:35 (GMT) |
|---|---|---|
| committer | Adam Badura <adam.f.badura@gmail.com> | 2019-07-27 20:25:32 (GMT) |
| commit | 1be5ce090707da5449214f6867ac3d2063fe2912 (patch) | |
| tree | dea325e8a4e56751defca59e4bc0c04fe2573703 /googlemock | |
| parent | 2134e3fd857d952e03ce76064fad5ac6e9036104 (diff) | |
| download | googletest-1be5ce090707da5449214f6867ac3d2063fe2912.zip googletest-1be5ce090707da5449214f6867ac3d2063fe2912.tar.gz googletest-1be5ce090707da5449214f6867ac3d2063fe2912.tar.bz2 | |
Correct CMake to cover Cygwinrefs/pull/2331/head
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index c204f27..f75ec45 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -142,7 +142,7 @@ if (gmock_build_tests) "$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\" $env:Path = \"$project_bin;$env:Path\" & $args") - elseif (MINGW) + elseif (MINGW OR CYGWIN) file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1" CONTENT "$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin) @@ -162,7 +162,7 @@ $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) + if (MINGW OR CYGWIN) target_compile_options(gmock-matchers_test PRIVATE "-Wa,-mbig-obj") endif() cxx_test(gmock-more-actions_test gmock_main) |