diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-11-26 16:38:13 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-11-26 16:38:13 -0500 |
| commit | 191f9336bc9212b5f5410ab663176f685cafed2a (patch) | |
| tree | 69ad4eb13331fa24f6b6a892ed79a590148276fe | |
| parent | fca458cab75b8c0db8828139fd4c195bfe74e25e (diff) | |
| parent | ce526b87007a15d86610eb16d8503188659f97e8 (diff) | |
| download | googletest-191f9336bc9212b5f5410ab663176f685cafed2a.tar.gz googletest-191f9336bc9212b5f5410ab663176f685cafed2a.tar.bz2 googletest-191f9336bc9212b5f5410ab663176f685cafed2a.zip | |
Merge pull request #1977 from lukasm91:issue_1955_remove_pthread_flags
PiperOrigin-RevId: 222861732
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9c055281..2b0ac21a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,22 +15,23 @@ matrix: sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - - os: linux compiler: clang sudo : true install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-bazel.sh - - os: linux + group: deprecated-2017Q4 compiler: gcc install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-autotools.sh env: VERBOSE=1 CXXFLAGS=-std=c++11 - os: linux + group: deprecated-2017Q4 compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 - os: linux + group: deprecated-2017Q4 compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - os: linux diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index be2d91bf..99725b73 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -56,7 +56,6 @@ macro(config_compiler_and_linker) unset(GTEST_HAS_PTHREAD) if (NOT gtest_disable_pthreads AND NOT MINGW) # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. - set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) if (CMAKE_USE_PTHREADS_INIT) set(GTEST_HAS_PTHREAD ON) |