diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-12-24 14:05:12 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-01-07 19:03:36 +0000 |
| commit | e0f1c67970559f7d39de81007b9d8d569eb685f6 (patch) | |
| tree | ac3dfd3de1d313771c15e68caa9bbed80e88a412 /CMakeLists.txt | |
| parent | 102a53c852bc9ee61a3d6442f6fbd4f47a1a16ad (diff) | |
cmake: make rpm-package dependent from dist target.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 23d4421593..6361bed624 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3093,14 +3093,9 @@ if(RPMBUILD_EXECUTABLE) ${CMAKE_SOURCE_DIR} ) - # XXX Replace with the "dist" target? - set(_export_tarball "${PROJECT_NAME}-${VERSION}.tar.xz") - add_custom_command( - OUTPUT "${CMAKE_BINARY_DIR}/packaging/rpm/SOURCES/${_export_tarball}" - COMMAND ${CMAKE_BINARY_DIR}/packaging/source/git-export-release.sh - -d "${CMAKE_BINARY_DIR}/packaging/rpm/SOURCES" - "${VERSION}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + add_custom_target(copy-dist + COMMAND cp ${CMAKE_BINARY_DIR}/wireshark*tar* ${CMAKE_BINARY_DIR}/packaging/rpm/SOURCES/ + DEPENDS dist ) add_custom_target(rpm-package COMMAND ${RPMBUILD_EXECUTABLE} @@ -3109,7 +3104,7 @@ if(RPMBUILD_EXECUTABLE) ${_rpmbuild_with_args} -v -ba SPECS/wireshark.spec - DEPENDS "${CMAKE_BINARY_DIR}/packaging/rpm/SOURCES/${_export_tarball}" + DEPENDS copy-dist WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/rpm" COMMENT "Create a rpm from the current git commit." ) |