Merge 036428e525 into 11607eb5bf
This commit is contained in:
commit
12c8eaf2b7
@ -1,5 +1,10 @@
|
||||
set(gtest_force_shared_crt ${MSVC_SHARED_RT} CACHE BOOL
|
||||
"Use shared (DLL) run-time lib even when Google Test built as a static lib.")
|
||||
|
||||
if(MINGW)
|
||||
set(gtest_disable_pthreads ON)
|
||||
endif()
|
||||
|
||||
add_subdirectory(gmock-1.7.0)
|
||||
include_directories(SYSTEM gmock-1.7.0/gtest/include)
|
||||
include_directories(SYSTEM gmock-1.7.0/include)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user