diff options
| author | Stepan Khapugin <stkhapugin@users.noreply.github.com> | 2017-09-07 15:44:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 15:44:18 +0200 |
| commit | e43a5948d51edbb78595c30d6fd1db6736156ddf (patch) | |
| tree | 754430bde6e9da802aa2bb07b54a51b8ed983fdc /googlemock | |
| parent | 9a8794faed3c6a7c80205122d73d93dcb376dd57 (diff) | |
| parent | a33b6b091999d44f771761be03beb64d3af2350a (diff) | |
| download | googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.tar.gz googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.tar.bz2 googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.zip | |
Merge branch 'master' into master
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() |