diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-07-29 11:58:34 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-07-29 11:58:34 -0400 |
| commit | b2983b2f2a08f3f9cefd84be0e5f1636f8c61282 (patch) | |
| tree | 592ff5d42ce8345df4c74dbf9d3f1b345bedb153 | |
| parent | bb481d2da65003a6afae672814dd99a9a17bda53 (diff) | |
| parent | 1be5ce090707da5449214f6867ac3d2063fe2912 (diff) | |
| download | googletest-b2983b2f2a08f3f9cefd84be0e5f1636f8c61282.tar.gz googletest-b2983b2f2a08f3f9cefd84be0e5f1636f8c61282.tar.bz2 googletest-b2983b2f2a08f3f9cefd84be0e5f1636f8c61282.zip | |
Merge pull request #2331 from adambadura:CMakeCorrection
PiperOrigin-RevId: 260509310
| -rw-r--r-- | googlemock/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index c204f271..f75ec45d 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) diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 52a615d5..db292946 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -188,7 +188,7 @@ if (gtest_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) |