Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/lost changes of rpm build #134

Open
wants to merge 4 commits into
base: fr3-develop
Choose a base branch
from
Open

Fix/lost changes of rpm build #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12ad482
add rpm to cpack config
ntorresalberto Dec 3, 2020
1bdcd4c
remove outdated comment
ntorresalberto Dec 4, 2020
4a6000b
add rpm dep to dockerfiles for the build
ntorresalberto Dec 4, 2020
a71c504
remove redundant setting for CPACK_DEBIAN_PACKAGE_ARCHITECTURE
ntorresalberto Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/Dockerfile.bionic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
libeigen3-dev \
libpoco-dev \
rename \
rpm \
valgrind \
lsb-release \
dpkg \
Expand Down
1 change: 1 addition & 0 deletions .ci/Dockerfile.focal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y \
libeigen3-dev \
libpoco-dev \
rename \
rpm \
valgrind \
lsb-release \
dpkg \
Expand Down
30 changes: 26 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,35 @@ endif()

## Packaging
set(CPACK_PACKAGE_VENDOR "Franka Emika GmbH")
set(CPACK_GENERATOR "DEB;TGZ")
set(CPACK_GENERATOR "DEB;TGZ;RPM")
set(CPACK_PACKAGE_VERSION ${libfranka_VERSION})
set(CPACK_SYSTEM_NAME ${CMAKE_HOST_SYSTEM_PROCESSOR})

# Debian versions require a dash
set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}-1)
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Franka Emika GmbH")
# Default permissions for directories created implicitly during installation of files by install() and file(INSTALL).
set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
OWNER_READ
OWNER_WRITE
OWNER_EXECUTE
GROUP_READ
GROUP_EXECUTE
WORLD_READ
WORLD_EXECUTE
)

# shared package info
set(PACKAGE_RELEASE 1) # adds build info MAJOR.MINOR.PATCH-RELEASE
set(PACKAGE_MAINTAINER "Franka Emika GmbH")

# RPM package info
set(CPACK_RPM_PACKAGE_RELEASE_DIST "%{dist}")
set(CPACK_RPM_PACKAGE_RELEASE ${PACKAGE_RELEASE})
set(CPACK_RPM_PACKAGE_MAINTAINER ${PACKAGE_MAINTAINER})
set(CPACK_RPM_PACKAGE_DEPENDS "poco-devel")
set(CPACK_RPM_PACKAGE_CONFLICTS "ros-libfranka-devel")

# Debian
set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${PACKAGE_MAINTAINER})
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpoco-dev")
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "ros-kinetic-libfranka, ros-melodic-libfranka, ros-noetic-libfranka, ros-foxy-libfranka")
include(CPack)
Expand Down