Fix SOURCE_DIR in HandleGTest.cmake (#703)

* Fix SOURCE_DIR in HandleGTest.cmake If benchmark added as cmake subproject, HandleGTest throws an error as does return absolute source dir. Change it to , so it will be refering to it's own source dir.

Fix SOURCE_DIR in HandleGTest.cmake (#703)
60975230 · Olzhas Kaiyrakhmet · Eric · 8503dfe5 · 60975230
Commit 60975230 authored Oct 13, 2018 by Olzhas Kaiyrakhmet Committed by Eric Oct 13, 2018
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

HandleGTest.cmake cmake/HandleGTest.cmake +11 -4

No files found.
--- a/cmake/HandleGTest.cmake
+++ b/cmake/HandleGTest.cmake
@@ -75,12 +75,10 @@ macro(build_external_gtest)
  endforeach()
 endmacro(build_external_gtest)

-if (BENCHMARK_ENABLE_GTEST_TESTS)
-  if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/googletest)
-    set(GTEST_ROOT "${CMAKE_SOURCE_DIR}/googletest")
+macro(build_gtest_from_dir)
  set(INSTALL_GTEST OFF CACHE INTERNAL "")
  set(INSTALL_GMOCK OFF CACHE INTERNAL "")
-    add_subdirectory(${CMAKE_SOURCE_DIR}/googletest)
+  add_subdirectory(${GTEST_ROOT} build)
  set(GTEST_BOTH_LIBRARIES gtest gmock gmock_main)
  foreach(HEADER test mock)
    # CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
@@ -96,6 +94,15 @@ if (BENCHMARK_ENABLE_GTEST_TESTS)
    endif()
    list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}})
  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)
    build_external_gtest()
  else()