diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:45:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:45:58 +0200 |
| commit | 1b5b246ff9f1928813baf9a8851b19e550b2f74b (patch) | |
| tree | 32c3d62c45ec0d7be324205826bf132f7131f0f2 /googlemock | |
| parent | 88b76525dd2731cdbad0c60d04464c083d863510 (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-1b5b246ff9f1928813baf9a8851b19e550b2f74b.tar.gz googletest-1b5b246ff9f1928813baf9a8851b19e550b2f74b.tar.bz2 googletest-1b5b246ff9f1928813baf9a8851b19e550b2f74b.zip | |
Merge branch 'master' into hethi/unused-import
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() |