diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-09-07 11:05:28 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-09-07 11:05:28 +0200 |
| commit | bc60b5a82704c611abab34b3eeb496edf8521015 (patch) | |
| tree | ae2100d3b8c74a585a8eae3885f5fa57ce045b84 /googlemock | |
| parent | 55fd999adf5a8ecfcd502f07b0ea4b691ca7215f (diff) | |
| parent | a33b6b091999d44f771761be03beb64d3af2350a (diff) | |
| download | googletest-bc60b5a82704c611abab34b3eeb496edf8521015.tar.gz googletest-bc60b5a82704c611abab34b3eeb496edf8521015.tar.bz2 googletest-bc60b5a82704c611abab34b3eeb496edf8521015.zip | |
Merge branch 'master' into hethi/travis-release-build
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() |