dolysis/benchmark
3
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-11-28 15:34:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix SOURCE_DIR in HandleGTest.cmake (#703)" (#704)

Browse source 
This reverts commit 609752306f.
This commit is contained in:
Eric 2018-10-13 00:53:25 -07:00 committed by GitHub
parent 609752306f
commit 8356d646bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmake/HandleGTest.cmake
View file

@ -75,10 +75,12 @@ macro(build_external_gtest)
endforeach() endforeach()
endmacro(build_external_gtest) endmacro(build_external_gtest)
macro(build_gtest_from_dir) if (BENCHMARK_ENABLE_GTEST_TESTS)
if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/googletest)
set(GTEST_ROOT "${CMAKE_SOURCE_DIR}/googletest")
set(INSTALL_GTEST OFF CACHE INTERNAL "") set(INSTALL_GTEST OFF CACHE INTERNAL "")
set(INSTALL_GMOCK OFF CACHE INTERNAL "") set(INSTALL_GMOCK OFF CACHE INTERNAL "")
add_subdirectory(${GTEST_ROOT} build) add_subdirectory(${CMAKE_SOURCE_DIR}/googletest)
set(GTEST_BOTH_LIBRARIES gtest gmock gmock_main) set(GTEST_BOTH_LIBRARIES gtest gmock gmock_main)
foreach(HEADER test mock) foreach(HEADER test mock)
# CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we # CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
@ -94,15 +96,6 @@ macro(build_gtest_from_dir)
endif() endif()
list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}}) list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}})
endforeach() endforeach()
endmacro()
if (BENCHMARK_ENABLE_GTEST_TESTS)
if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/googletest)
set(GTEST_ROOT "${CMAKE_SOURCE_DIR}/googletest")
build_gtest_from_dir()
elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/googletest")
build_gtest_from_dir()
elseif(BENCHMARK_DOWNLOAD_DEPENDENCIES) elseif(BENCHMARK_DOWNLOAD_DEPENDENCIES)
build_external_gtest() build_external_gtest()
else() else()