diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2017-09-06 11:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 11:25:46 +0100 |
| commit | a92c362cfbc681c5940594c334479d1471107524 (patch) | |
| tree | c8488450f7ecc971e3debe9c6e7e87f198733e06 /googlemock | |
| parent | 86e5f0083e5217e37eb94a391a2f7349bcef4660 (diff) | |
| parent | 857ddeadebe4aa75efcee728651d0947a5a1065a (diff) | |
| download | googletest-a92c362cfbc681c5940594c334479d1471107524.tar.gz googletest-a92c362cfbc681c5940594c334479d1471107524.tar.bz2 googletest-a92c362cfbc681c5940594c334479d1471107524.zip | |
Merge branch 'master' into 2017_09_04_parametrized
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() |