diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:47:14 +0200 |
| commit | c86fbd766b4d2e4b20ad7f2d6129f77452455f6e (patch) | |
| tree | 3d5f8698ddff82e59fbe579c7e8ee664388ae51b /googlemock | |
| parent | aa0b5458a1c33b40f813013f3a6bbb928f8a3d9f (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.tar.gz googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.tar.bz2 googletest-c86fbd766b4d2e4b20ad7f2d6129f77452455f6e.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index bd759dfd..724fdd5f 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -164,7 +164,7 @@ if (gmock_build_tests) cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc) cxx_test(gmock_test gmock_main) - if (CMAKE_USE_PTHREADS_INIT) + if (DEFINED GTEST_HAS_PTHREAD) cxx_test(gmock_stress_test gmock) endif() |