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

Re-enable building a dist tarball from within distcheck

Browse Source
This commit is contained in:
Geert Janssens 2018-01-29 19:15:02 +01:00
parent 49a936c1fd
commit f319a8e2a4
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -781,10 +781,6 @@ endif()
dist_add_generated(ChangeLog)
############################ BEGIN MAKE DIST #################
# For now only enable the dist target when building from git
# the generation of dist_generated should be improved to work
# also when running from a tarball before that can be generalized.
IF (BUILDING_FROM_VCS)
SET(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
SET(DIST_FILE "${PACKAGE_PREFIX}.tar")
@ -847,9 +843,6 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist
-P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
)
ENDIF()
############################# END MAKE DIST #################
# uninstall target

12
common/cmake_modules/MakeDistCheck.cmake
View File

@ -76,12 +76,12 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
ERROR_MSG "Ninja check failed."
)
# # Run ninja dist
# EXECUTE_PROCESS_AND_CHECK_RESULT(
# COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} dist
# WORKING_DIRECTORY ${BUILD_DIR}
# ERROR_MSG "Ninja dist failed."
# )
# Run ninja dist
EXECUTE_PROCESS_AND_CHECK_RESULT(
COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} dist
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "Ninja dist failed."
)
MESSAGE("distcheck complete.")