From 8c9855a6bb226e612993e4fc5ea37b0a652f78a6 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 11 Mar 2018 10:38:05 -0700
Subject: [PATCH] Pass GTEST_ROOT and GMOCK_ROOT through to distcheck.

So that they don't have to be exported in the environment if they're needed.
---
 CMakeLists.txt                           | 2 ++
 common/cmake_modules/MakeDistCheck.cmake | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbf92a51a4..0ec7081276 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,6 +847,8 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist
             -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
             -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+            -D GTEST_ROOT=${GTEST_ROOT}
+            -D GMOCK_ROOT=${GMOCK_ROOT}
             -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
         )
 
diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
index 100ff4fa44..606915f322 100644
--- a/common/cmake_modules/MakeDistCheck.cmake
+++ b/common/cmake_modules/MakeDistCheck.cmake
@@ -50,6 +50,8 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
               -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
               -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
               -D CMAKE_INSTALL_PREFIX=../${INSTALL_DIR}
+              -D GTEST_ROOT=${GTEST_ROOT}
+              -D GMOCK_ROOT=${GMOCK_ROOT}
               ../${PACKAGE_PREFIX}
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "CMake configure command failed."