diff options
| author | Stepan Khapugin <stkhapugin@users.noreply.github.com> | 2017-09-07 13:44:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 13:44:18 (GMT) |
| commit | e43a5948d51edbb78595c30d6fd1db6736156ddf (patch) | |
| tree | 754430bde6e9da802aa2bb07b54a51b8ed983fdc /googletest | |
| parent | 9a8794faed3c6a7c80205122d73d93dcb376dd57 (diff) | |
| parent | a33b6b091999d44f771761be03beb64d3af2350a (diff) | |
| download | googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.zip googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.tar.gz googletest-e43a5948d51edbb78595c30d6fd1db6736156ddf.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index ec5d08c..ce94733 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -48,10 +48,14 @@ endmacro() macro(config_compiler_and_linker) # Note: pthreads on MinGW is not supported, even if available # instead, we use windows threading primitives + 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) + endif() endif() fix_default_compiler_settings_() @@ -126,7 +130,8 @@ macro(config_compiler_and_linker) set(cxx_no_rtti_flags "") endif() - if (CMAKE_USE_PTHREADS_INIT) # The pthreads library is available and allowed. + # The pthreads library is available and allowed? + if (DEFINED GTEST_HAS_PTHREAD) set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=1") else() set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0") @@ -159,7 +164,7 @@ function(cxx_library_with_type name type cxx_flags) PROPERTIES COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1") endif() - if (CMAKE_USE_PTHREADS_INIT) + if (DEFINED GTEST_HAS_PTHREAD) target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT}) endif() endfunction() |