summaryrefslogtreecommitdiffstats
path: root/conf.d/templates/cmake
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2017-06-07 15:19:51 +0200
committerGitHub <noreply@github.com>2017-06-07 15:19:51 +0200
commit714eb879caedcc32674b26fdc7583a6fcfeb4f85 (patch)
treee58fa59771825187d1030be6b2adeb30ac3890f9 /conf.d/templates/cmake
parent456b7d066103dba85bc1bcf3cba36d1974aae277 (diff)
parentfbc5ea2207be7c8f3200de6c14ee8729c723c2fb (diff)
Merge pull request #2 from ronan22/master
add packaging
Diffstat (limited to 'conf.d/templates/cmake')
-rw-r--r--conf.d/templates/cmake/common.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/conf.d/templates/cmake/common.cmake b/conf.d/templates/cmake/common.cmake
index 25a665d..b46e809 100644
--- a/conf.d/templates/cmake/common.cmake
+++ b/conf.d/templates/cmake/common.cmake
@@ -207,11 +207,12 @@ macro(rpm_package_build)
endforeach()
# build rpm spec file from template
- configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${SPEC_DIR}/rpm-${PROJECT_NAME}.spec)
+ configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${SPEC_DIR}/${PROJECT_NAME}.spec)
add_custom_command(OUTPUT ${PROJECT_NAME}.rpm
DEPENDS ${PROJECT_TARGETS}
- COMMAND rpmbuild -ba ${SPEC_DIR}/rpm-${PROJECT_NAME}.spec
+ COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git archive --format=tar.gz --prefix=${PROJECT_NAME}-${PROJECT_VERSION}/ HEAD -o ${SPEC_DIR}/${PROJECT_NAME}_${PROJECT_VERSION}.orig.tar.gz
+ COMMAND rpmbuild --define=\"%_sourcedir ${SPEC_DIR}\" -ba ${SPEC_DIR}/${PROJECT_NAME}.spec
)
add_custom_target(rpm DEPENDS ${PROJECT_NAME}.rpm)
@@ -379,4 +380,4 @@ macro(project_closing_msg)
endmacro()
# Add RSYSTARGET
-remote_targets_populate() \ No newline at end of file
+remote_targets_populate()