Better dependencies for make rpm and dist

This commit is contained in:
louiz’
2016-08-20 02:36:01 +02:00
parent 7d05f9b6ae
commit d6a22b27f3
+5 -3
View File
@@ -246,7 +246,7 @@ install(FILES conf/biboumi.cfg DESTINATION /etc/bib
## Dist target ## Dist target
## Generate a release tarball from the git sources ## Generate a release tarball from the git sources
# #
add_custom_target(dist add_custom_command(OUTPUT ${ARCHIVE_NAME}.tar.xz
COMMAND git archive --prefix=${ARCHIVE_NAME}/ --format=tar HEAD COMMAND git archive --prefix=${ARCHIVE_NAME}/ --format=tar HEAD
> ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar > ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar
# Append this specific file that is not part of the git repo # Append this specific file that is not part of the git repo
@@ -258,13 +258,15 @@ add_custom_target(dist
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created." COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created."
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )
add_dependencies(dist catch) add_custom_target(dist
DEPENDS ${ARCHIVE_NAME}.tar.xz
DEPENDS catch)
add_custom_target(rpm add_custom_target(rpm
DEPENDS dist
COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
COMMAND rpmbuild --define "_topdir `pwd`/rpmbuild/" --define "_sourcedir `pwd`" -ba biboumi.spec COMMAND rpmbuild --define "_topdir `pwd`/rpmbuild/" --define "_sourcedir `pwd`" -ba biboumi.spec
) )
add_dependencies(rpm dist)
if(BOTAN_FOUND) if(BOTAN_FOUND)
set(STR_WITH_BOTAN "Botan: yes") set(STR_WITH_BOTAN "Botan: yes")