IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Pass GTEST_ROOT and GMOCK_ROOT through to distcheck.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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
)

2
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_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."