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.
This commit is contained in:
John Ralls 2018-03-11 10:38:05 -07:00
parent 3ccebde831
commit 8c9855a6bb
2 changed files with 4 additions and 0 deletions

View File

@ -847,6 +847,8 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist
-D PACKAGE_PREFIX=${PACKAGE_PREFIX} -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
-D CMAKE_C_FLAGS=${CMAKE_C_FLAGS} -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-D CMAKE_CXX_FLAGS=${CMAKE_CXX_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 -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
) )

View File

@ -50,6 +50,8 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
-D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-D CMAKE_INSTALL_PREFIX=../${INSTALL_DIR} -D CMAKE_INSTALL_PREFIX=../${INSTALL_DIR}
-D GTEST_ROOT=${GTEST_ROOT}
-D GMOCK_ROOT=${GMOCK_ROOT}
../${PACKAGE_PREFIX} ../${PACKAGE_PREFIX}
WORKING_DIRECTORY ${BUILD_DIR} WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "CMake configure command failed." ERROR_MSG "CMake configure command failed."