diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-08 11:47:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:47:45 +0200 |
| commit | 803ab9a860694e96e2c48784c12dbdee30447726 (patch) | |
| tree | 09c3cd45aa96e9598b28965a2194fcc5ba41ce2a /googlemock | |
| parent | e8c6942ac1570c9598cf2d177f6c69cc5ab2bd7b (diff) | |
| parent | 894cdb82cb2a1141bde8710a67ea4c5325d1d202 (diff) | |
| download | googletest-803ab9a860694e96e2c48784c12dbdee30447726.tar.gz googletest-803ab9a860694e96e2c48784c12dbdee30447726.tar.bz2 googletest-803ab9a860694e96e2c48784c12dbdee30447726.zip | |
Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path
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() |