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

No need for make dist and distcheck when checking autotools build in cmake

Browse Source
This commit is contained in:
Rob Gowin 2017-06-06 10:17:03 -05:00 committed by John Ralls
parent 6b14dc5b59
commit e67f45003b
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cmake_modules/MakeDistCheck.cmake
View File

@ -106,7 +106,8 @@ FUNCTION(RUN_AUTOTOOLS_DIST_CHECK PACKAGE_PREFIX)
EXECUTE_PROCESS_AND_CHECK_RESULT(
COMMAND ${MY_CMAKE_COMMAND}
LDFLAGS=-L${CMAKE_PREFIX_PATH}/lib
CFLAGS=-m32
CFLAGS=${CMAKE_C_FLAGS}
CXXFLAGS=${CMAKE_CXX_FLAGS}
CPPFLAGS=-I${CMAKE_PREFIX_PATH}/include
PATH=${CMAKE_PREFIX_PATH}/bin:$ENV{PATH}
./configure --prefix=${CMAKE_CURRENT_SOURCE_DIR}/${INSTALL_DIR} --enable-compile-warnings
@ -147,31 +148,6 @@ FUNCTION(RUN_AUTOTOOLS_DIST_CHECK PACKAGE_PREFIX)
ERROR_MSG "Autotools 'make uninstall' step failed."
)
EXECUTE_PROCESS_AND_CHECK_RESULT(
COMMAND ${MY_CMAKE_COMMAND} make dist
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Autotools 'make dist' step failed."
)
IF (CMAKE_PREFIX_PATH)
EXECUTE_PROCESS_AND_CHECK_RESULT(
COMMAND ${MY_CMAKE_COMMAND}
LDFLAGS=-L${CMAKE_PREFIX_PATH}/lib
CFLAGS=-m32
CPPFLAGS=-I${CMAKE_PREFIX_PATH}/include
PATH=${CMAKE_PREFIX_PATH}/bin:$ENV{PATH}
DISTCHECK_CONFIGURE_FLAGS="--with-dbi-dbd-dir=${CMAKE_PREFIX_PATH}/lib/dbd"
make distcheck
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Autotools 'make distcheck' step failed."
)
ELSE()
EXECUTE_PROCESS_AND_CHECK_RESULT(
COMMAND ${MY_CMAKE_COMMAND} make distcheck
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Autotools 'make distcheck' step failed."
)
ENDIF()
MESSAGE("Autotools distcheck complete.")
ENDFUNCTION()