Merge branch 'master'
This commit is contained in:
commit
6ac806fefd
@ -2,7 +2,7 @@ if(USE_DMLC_GTEST)
|
|||||||
if(NOT TARGET gtest)
|
if(NOT TARGET gtest)
|
||||||
message(FATAL_ERROR "USE_DMLC_GTEST=ON but dmlc-core didn't bundle gtest")
|
message(FATAL_ERROR "USE_DMLC_GTEST=ON but dmlc-core didn't bundle gtest")
|
||||||
endif()
|
endif()
|
||||||
set(GTEST_LIBRARIES gtest)
|
set(GTEST_LIBRARIES gtest gmock)
|
||||||
else()
|
else()
|
||||||
find_package(GTest REQUIRED)
|
find_package(GTest REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user